Author: gnodet
Date: Wed Jan 23 02:06:14 2008
New Revision: 614477
URL: http://svn.apache.org/viewvc?rev=614477&view=rev
Log:
Fix create command and move it to an 'admin' sub shell
Added:
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.features.cfg
- copied, changed from r614449,
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.management.cfg
Removed:
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.management.cfg
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/CreateCommand.java
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/config.properties
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.shell.cfg
Modified:
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties?rev=614477&r1=614476&r2=614477&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
(original)
+++
servicemix/smx4/kernel/trunk/assembly/src/main/filtered-resources/etc/startup.properties
Wed Jan 23 02:06:14 2008
@@ -26,18 +26,18 @@
geronimo-servlet_2.5_spec-${geronimo.servlet.version}.jar=10
org.osgi.compendium-${felix.compendium.version}.jar=10
org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
-org.apache.servicemix.kernel.filemonitor-${version}.jar=15
+org.apache.servicemix.kernel.filemonitor-${pom.version}.jar=15
pax-logging-api-${pax.logging.version}.jar=20
pax-logging-service-${pax.logging.version}.jar=20
#
# The rest of the services..
#
-org.apache.servicemix.bundles.ant-${ant.version}-${version}.jar=50
-org.apache.servicemix.bundles.aopalliance-${aopalliance.version}-${version}.jar=50
-org.apache.servicemix.bundles.cglib-${cglib.version}-${version}.jar=50
-org.apache.servicemix.bundles.mina-${mina.version}-${version}.jar=50
-org.apache.servicemix.bundles.xstream-${xstream.version}-${version}.jar=50
+org.apache.servicemix.bundles.ant-${ant.version}-${pom.version}.jar=50
+org.apache.servicemix.bundles.aopalliance-${aopalliance.version}-${pom.version}.jar=50
+org.apache.servicemix.bundles.cglib-${cglib.version}-${pom.version}.jar=50
+org.apache.servicemix.bundles.mina-${mina.version}-${pom.version}.jar=50
+org.apache.servicemix.bundles.xstream-${xstream.version}-${pom.version}.jar=50
geronimo-stax-api_1.0_spec-${geronimo.stax.version}.jar=50
spring-aop-${spring.version}.jar=50
spring-beans-${spring.version}.jar=50
@@ -46,15 +46,15 @@
spring-osgi-core-${spring.osgi.version}.jar=50
spring-osgi-extender-${spring.osgi.version}.jar=50
spring-osgi-io-${spring.osgi.version}.jar=50
-org.apache.servicemix.kernel.spring-${version}.jar=50
+org.apache.servicemix.kernel.spring-${pom.version}.jar=50
org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=50
pax-runner-handler-mvn-${pax.runner.version}.jar=50
-org.apache.servicemix.kernel.gshell.obr-${version}.jar=50
-org.apache.servicemix.kernel.gshell.osgi-${version}.jar=50
-org.apache.servicemix.kernel.gshell.features-${version}.jar=50
+org.apache.servicemix.kernel.gshell.obr-${pom.version}.jar=50
+org.apache.servicemix.kernel.gshell.osgi-${pom.version}.jar=50
+org.apache.servicemix.kernel.gshell.features-${pom.version}.jar=50
#
# Start console last
#
-org.apache.servicemix.kernel.gshell.core-${version}.jar=100
+org.apache.servicemix.kernel.gshell.core-${pom.version}.jar=100
Added:
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties?rev=614477&view=auto
==============================================================================
---
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties
(added)
+++
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/spring/etc/startup.properties
Wed Jan 23 02:06:14 2008
@@ -0,0 +1,60 @@
+################################################################################
+#
+# 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 file allows you to control the start level of each bundle.
+#
+
+#
+# Startup core services like logging
+#
+geronimo-servlet_2.5_spec-${geronimo.servlet.version}.jar=10
+org.osgi.compendium-${felix.compendium.version}.jar=10
+org.apache.felix.configadmin-${felix.configadmin.version}.jar=10
+org.apache.servicemix.kernel.filemonitor-${pom.version}.jar=15
+pax-logging-api-${pax.logging.version}.jar=20
+pax-logging-service-${pax.logging.version}.jar=20
+
+#
+# The rest of the services..
+#
+org.apache.servicemix.bundles.ant-${ant.version}-${pom.version}.jar=50
+org.apache.servicemix.bundles.aopalliance-${aopalliance.version}-${pom.version}.jar=50
+org.apache.servicemix.bundles.cglib-${cglib.version}-${pom.version}.jar=50
+org.apache.servicemix.bundles.mina-${mina.version}-${pom.version}.jar=50
+org.apache.servicemix.bundles.xstream-${xstream.version}-${pom.version}.jar=50
+geronimo-stax-api_1.0_spec-${geronimo.stax.version}.jar=50
+spring-aop-${spring.version}.jar=50
+spring-beans-${spring.version}.jar=50
+spring-context-${spring.version}.jar=50
+spring-core-${spring.version}.jar=50
+spring-osgi-core-${spring.osgi.version}.jar=50
+spring-osgi-extender-${spring.osgi.version}.jar=50
+spring-osgi-io-${spring.osgi.version}.jar=50
+org.apache.servicemix.kernel.spring-${pom.version}.jar=50
+org.apache.felix.bundlerepository-${felix.bundlerepository.version}.jar=50
+pax-runner-handler-mvn-${pax.runner.version}.jar=50
+org.apache.servicemix.kernel.gshell.obr-${pom.version}.jar=50
+org.apache.servicemix.kernel.gshell.osgi-${pom.version}.jar=50
+org.apache.servicemix.kernel.gshell.features-${pom.version}.jar=50
+
+#
+# Start console last
+#
+org.apache.servicemix.kernel.gshell.core-${pom.version}.jar=100
+
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/CreateCommand.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/CreateCommand.java?rev=614477&r1=614476&r2=614477&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/CreateCommand.java
(original)
+++
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/CreateCommand.java
Wed Jan 23 02:06:14 2008
@@ -57,10 +57,11 @@
copyResourceToDir(serviceMixBase,
"etc/config.properties", true);
copyResourceToDir(serviceMixBase, "etc/login.conf",
true);
- copyResourceToDir(serviceMixBase,
"etc/org.apache.servicemix.management.cfg", true);
+ copyResourceToDir(serviceMixBase,
"etc/org.apache.servicemix.features.cfg", true);
copyResourceToDir(serviceMixBase,
"etc/org.apache.servicemix.shell.cfg", true);
copyResourceToDir(serviceMixBase,
"etc/org.ops4j.pax.logging.cfg", true);
- copyResourceToDir(serviceMixBase,
"etc/system.properties", true);
+ copyResourceToDir(serviceMixBase, "etc/startup.properties", true);
+ copyResourceToDir(serviceMixBase, "etc/system.properties", true);
HashMap<String, String> props = new HashMap<String,
String>();
props.put("${servicemix.home}",
System.getProperty("servicemix.home"));
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml?rev=614477&r1=614476&r2=614477&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
(original)
+++
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
Wed Jan 23 02:06:14 2008
@@ -89,9 +89,10 @@
</osgi:service>
<osgi:service ref="create"
interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="alias" value="create"/>
- </osgi:service-properties>
+ <osgi:service-properties>
+ <entry key="shell" value="admin"/>
+ <entry key="alias" value="create"/>
+ </osgi:service-properties>
</osgi:service>
<osgix:property-placeholder persistent-id="org.apache.servicemix.shell">
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/config.properties
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/config.properties?rev=614477&r1=614476&r2=614477&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/config.properties
(original)
+++
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/config.properties
Wed Jan 23 02:06:14 2008
@@ -25,12 +25,13 @@
org.osgi.service.startlevel; version=1.0.0, \
org.osgi.service.url; version=1.0.0, \
org.apache.servicemix.kernel.main.spi, \
+ com.sun.management, \
${jre-${java.specification.version}}
#org.osgi.framework.bootdelegation=sun.*,com.sun.*
# To enable the use of the startup.properties file to control the start level:
-#felix.auto.start=startup.properties
-felix.auto.start=all
+felix.auto.start=startup.properties
+#felix.auto.start=all
felix.startlevel.framework=100
felix.startlevel.bundle=50
Copied:
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.features.cfg
(from r614449,
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.management.cfg)
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.features.cfg?p2=servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.features.cfg&p1=servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.management.cfg&r1=614449&r2=614477&rev=614477&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.management.cfg
(original)
+++
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.features.cfg
Wed Jan 23 02:06:14 2008
@@ -18,10 +18,4 @@
################################################################################
#
-rmiRegistryPort = 1099
-jmxLogin = smx
-jmxPassword = smx
-serviceUrl = service:jmx:rmi:///jndi/rmi://localhost:1099/jmxrmi
-daemon = true
-threaded = true
-objectName = connector:name=rmi
+featuresRepositories=http://svn.apache.org/repos/asf/servicemix/smx4/obr-repo/features.xml
Modified:
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.shell.cfg
URL:
http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.shell.cfg?rev=614477&r1=614476&r2=614477&view=diff
==============================================================================
---
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.shell.cfg
(original)
+++
servicemix/smx4/kernel/trunk/gshell/gshell-core/src/main/resources/org/apache/geronimo/gshell/spring/etc/org.apache.servicemix.shell.cfg
Wed Jan 23 02:06:14 2008
@@ -18,6 +18,6 @@
################################################################################
#
-startLocalConsole=true
-startRemoteShell=true
+startLocalConsole=${servicemix.startLocalConsole}
+startRemoteShell=${servicemix.startRemoteShell}
remoteShellLocation=tcp://0.0.0.0:8101/
