You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2008/10/23 19:54:15 UTC
svn commit: r707428 [2/3] - in /servicemix/smx4/kernel/trunk: ./ assembly/
client/src/main/java/org/apache/servicemix/kernel/client/ gshell/
gshell/gshell-admin/
gshell/gshell-admin/src/main/java/org/apache/servicemix/kernel/gshell/admin/internal/
gshe...
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/FeaturesServiceImpl.java Thu Oct 23 10:54:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.features.internal;
+package org.apache.servicemix.kernel.gshell.features.internal;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -38,9 +38,9 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.servicemix.gshell.features.Feature;
-import org.apache.servicemix.gshell.features.FeaturesService;
-import org.apache.servicemix.gshell.features.Repository;
+import org.apache.servicemix.kernel.gshell.features.Feature;
+import org.apache.servicemix.kernel.gshell.features.FeaturesService;
+import org.apache.servicemix.kernel.gshell.features.Repository;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleContext;
import org.osgi.framework.Constants;
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/RepositoryImpl.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/RepositoryImpl.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/RepositoryImpl.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/RepositoryImpl.java Thu Oct 23 10:54:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.features.internal;
+package org.apache.servicemix.kernel.gshell.features.internal;
import java.io.ByteArrayInputStream;
import java.io.IOException;
@@ -34,8 +34,8 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.Node;
-import org.apache.servicemix.gshell.features.Feature;
-import org.apache.servicemix.gshell.features.Repository;
+import org.apache.servicemix.kernel.gshell.features.Feature;
+import org.apache.servicemix.kernel.gshell.features.Repository;
import org.xml.sax.SAXException;
/**
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/AddUrlCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/AddUrlCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/AddUrlCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/AddUrlCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/AddUrlCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/AddUrlCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/AddUrlCommand.java Thu Oct 23 10:54:10 2008
@@ -14,16 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.internal.commands;
import java.util.List;
import java.net.URI;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
-import org.apache.servicemix.gshell.features.FeaturesService;
+import org.apache.servicemix.kernel.gshell.features.FeaturesService;
-@CommandComponent(id="features:addUrl", description="Add a list of repository URLs to the features service")
public class AddUrlCommand extends FeaturesCommandSupport {
@Argument(required = true, multiValued = true, description = "Repository URLs")
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/FeaturesCommandSupport.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/FeaturesCommandSupport.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/FeaturesCommandSupport.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/FeaturesCommandSupport.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/FeaturesCommandSupport.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/FeaturesCommandSupport.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/FeaturesCommandSupport.java Thu Oct 23 10:54:10 2008
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.internal.commands;
-import org.apache.geronimo.gshell.support.OsgiCommandSupport;
-import org.apache.servicemix.gshell.features.FeaturesService;
+import org.apache.servicemix.kernel.gshell.features.FeaturesService;
+import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.obr.RepositoryAdmin;
public abstract class FeaturesCommandSupport extends OsgiCommandSupport {
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/InstallFeatureCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/InstallFeatureCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/InstallFeatureCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/InstallFeatureCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/InstallFeatureCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/InstallFeatureCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/InstallFeatureCommand.java Thu Oct 23 10:54:10 2008
@@ -14,16 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.internal.commands;
import java.util.List;
import java.net.URL;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
-import org.apache.servicemix.gshell.features.FeaturesService;
+import org.apache.servicemix.kernel.gshell.features.FeaturesService;
-@CommandComponent(id="features:install", description="Install a feature")
public class InstallFeatureCommand extends FeaturesCommandSupport {
@Argument(required = true, description = "The name of the feature")
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListFeaturesCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListFeaturesCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListFeaturesCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListFeaturesCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListFeaturesCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListFeaturesCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListFeaturesCommand.java Thu Oct 23 10:54:10 2008
@@ -14,13 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.internal.commands;
-import org.apache.servicemix.gshell.features.FeaturesService;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.servicemix.kernel.gshell.features.FeaturesService;
import org.apache.geronimo.gshell.clp.Option;
-@CommandComponent(id="features:list", description="List existing features.")
public class ListFeaturesCommand extends FeaturesCommandSupport {
@Option(name = "-i", aliases={"--installed"}, description="Display the list of installed features")
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListUrlCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListUrlCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListUrlCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListUrlCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListUrlCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListUrlCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/ListUrlCommand.java Thu Oct 23 10:54:10 2008
@@ -14,13 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.internal.commands;
-import org.apache.servicemix.gshell.features.FeaturesService;
-import org.apache.servicemix.gshell.features.Repository;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
+import org.apache.servicemix.kernel.gshell.features.FeaturesService;
+import org.apache.servicemix.kernel.gshell.features.Repository;
-@CommandComponent(id="features:listUrl", description="Display the repository URLs currently associated with the features service.")
public class ListUrlCommand extends FeaturesCommandSupport {
protected void doExecute(FeaturesService admin) throws Exception {
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RefreshUrlCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/RefreshUrlCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RefreshUrlCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RefreshUrlCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/RefreshUrlCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/RefreshUrlCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RefreshUrlCommand.java Thu Oct 23 10:54:10 2008
@@ -14,18 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.internal.commands;
import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
-import org.apache.servicemix.gshell.features.FeaturesService;
-import org.apache.servicemix.gshell.features.Repository;
+import org.apache.servicemix.kernel.gshell.features.FeaturesService;
+import org.apache.servicemix.kernel.gshell.features.Repository;
-@CommandComponent(id="features:refreshUrl", description="Reload the repositories to obtain a fresh list of features")
public class RefreshUrlCommand extends FeaturesCommandSupport {
@Argument(required = false, multiValued = true, description = "Repository URLs (leave empty for all)")
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RemoveUrlCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/RemoveUrlCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RemoveUrlCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RemoveUrlCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/RemoveUrlCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/RemoveUrlCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/RemoveUrlCommand.java Thu Oct 23 10:54:10 2008
@@ -14,16 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.internal.commands;
import java.util.List;
import java.net.URI;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.servicemix.gshell.features.FeaturesService;
+import org.apache.servicemix.kernel.gshell.features.FeaturesService;
-@CommandComponent(id="features:removeUrl", description="Remove a list of repository URLs from the features service")
public class RemoveUrlCommand extends FeaturesCommandSupport {
@Argument(required = true, multiValued = true, description = "Repository URLs")
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/UninstallFeatureCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/UninstallFeatureCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/UninstallFeatureCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/UninstallFeatureCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/UninstallFeatureCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/UninstallFeatureCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/kernel/gshell/features/internal/commands/UninstallFeatureCommand.java Thu Oct 23 10:54:10 2008
@@ -14,16 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.features.internal.commands;
+package org.apache.servicemix.kernel.gshell.features.internal.commands;
import java.util.List;
import java.net.URL;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
-import org.apache.servicemix.gshell.features.FeaturesService;
+import org.apache.servicemix.kernel.gshell.features.FeaturesService;
-@CommandComponent(id="features:uninstall", description="Uninstall a feature")
public class UninstallFeatureCommand extends FeaturesCommandSupport {
@Argument(required = true, description = "The name of the feature")
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml?rev=707428&r1=707427&r2=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml Thu Oct 23 10:54:10 2008
@@ -22,31 +22,46 @@
xmlns:osgi="http://www.springframework.org/schema/osgi"
xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:gshell="http://servicemix.apache.org/schema/servicemix-gshell"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd
http://www.springframework.org/schema/osgi-compendium
- http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
-
- <bean id="addUrl" class="org.apache.servicemix.gshell.features.internal.commands.AddUrlCommand" />
-
- <bean id="listUrl" class="org.apache.servicemix.gshell.features.internal.commands.ListUrlCommand" />
-
- <bean id="removeUrl" class="org.apache.servicemix.gshell.features.internal.commands.RemoveUrlCommand" />
-
- <bean id="refreshUrl" class="org.apache.servicemix.gshell.features.internal.commands.RefreshUrlCommand" />
-
- <bean id="installFeature" class="org.apache.servicemix.gshell.features.internal.commands.InstallFeatureCommand" />
+ http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util.xsd
+ http://servicemix.apache.org/schema/servicemix-gshell
+ http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
- <bean id="uninstallFeature" class="org.apache.servicemix.gshell.features.internal.commands.UninstallFeatureCommand" />
+ <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
- <bean id="listFeatures" class="org.apache.servicemix.gshell.features.internal.commands.ListFeaturesCommand" />
+ <gshell:command-bundle>
+ <gshell:command name="features/addUrl">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.features.internal.commands.AddUrlCommand" />
+ </gshell:command>
+ <gshell:command name="features/listUrl">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.features.internal.commands.ListUrlCommand" />
+ </gshell:command>
+ <gshell:command name="features/remoteUrl">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.features.internal.commands.RemoveUrlCommand" />
+ </gshell:command>
+ <gshell:command name="features/refreshUrl">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.features.internal.commands.RefreshUrlCommand" />
+ </gshell:command>
+ <gshell:command name="features/install">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.features.internal.commands.InstallFeatureCommand" />
+ </gshell:command>
+ <gshell:command name="features/uninstall">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.features.internal.commands.UninstallFeatureCommand" />
+ </gshell:command>
+ <gshell:command name="features/listFeatures">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.features.internal.commands.ListFeaturesCommand" />
+ </gshell:command>
+ </gshell:command-bundle>
- <bean id="featuresService" class="org.apache.servicemix.gshell.features.internal.FeaturesServiceImpl" init-method="start" destroy-method="stop">
+ <bean id="featuresService" class="org.apache.servicemix.kernel.gshell.features.internal.FeaturesServiceImpl" init-method="start" destroy-method="stop">
<property name="urls" value="${featuresRepositories}" />
<property name="boot" value="${featuresBoot}" />
<property name="configAdmin" ref="configAdmin" />
@@ -57,56 +72,7 @@
<osgi:reference id="preferences" interface="org.osgi.service.prefs.PreferencesService" cardinality="0..1" />
- <osgi:service ref="addUrl" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="features"/>
- <entry key="alias" value="addUrl"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="listUrl" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="features"/>
- <entry key="alias" value="listUrl"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="removeUrl" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="features"/>
- <entry key="alias" value="removeUrl"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="refreshUrl" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="features"/>
- <entry key="alias" value="refreshUrl"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="installFeature" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="features"/>
- <entry key="alias" value="installFeature"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="uninstallFeature" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="features"/>
- <entry key="alias" value="uninstallFeature"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="listFeatures" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="features"/>
- <entry key="alias" value="listFeatures"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="featuresService" interface="org.apache.servicemix.gshell.features.FeaturesService" />
+ <osgi:service ref="featuresService" interface="org.apache.servicemix.kernel.gshell.features.FeaturesService" />
<osgix:property-placeholder persistent-id="org.apache.servicemix.features">
<osgix:default-properties>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/pom.xml?rev=707428&r1=707427&r2=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/pom.xml Thu Oct 23 10:54:10 2008
@@ -76,9 +76,14 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>
- org.apache.servicemix.gshell.log*;version=${project.version};-split-package:=merge-first
+ org.apache.servicemix.kernel.gshell.log*;version=${project.version};-split-package:=merge-first
</Export-Package>
- <Import-Package>org.ops4j.pax.logging,*</Import-Package>
+ <Import-Package>
+ org.apache.geronimo.gshell.wisdom.command,
+ org.apache.servicemix.kernel.gshell.core,
+ org.ops4j.pax.logging,
+ *
+ </Import-Package>
<Private-Package>!*</Private-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayException.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/DisplayException.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayException.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayException.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/DisplayException.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/DisplayException.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayException.java Thu Oct 23 10:54:10 2008
@@ -14,24 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.log;
+package org.apache.servicemix.kernel.gshell.log;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
-import org.apache.geronimo.gshell.support.OsgiCommandSupport;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
+import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
-@CommandComponent(id = "log:display-exception", description = "Display last exception in the log")
public class DisplayException extends OsgiCommandSupport {
protected LruList<PaxLoggingEvent> events;
- @Override
- protected OsgiCommandSupport createCommand() throws Exception {
- DisplayException command = new DisplayException();
- command.setEvents(getEvents());
- return command;
- }
-
public LruList<PaxLoggingEvent> getEvents() {
return events;
}
@@ -55,7 +46,7 @@
}
io.out.println();
}
- return SUCCESS;
+ return Result.SUCCESS;
}
}
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayLog.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/DisplayLog.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayLog.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayLog.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/DisplayLog.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/DisplayLog.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/DisplayLog.java Thu Oct 23 10:54:10 2008
@@ -14,19 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.log;
+package org.apache.servicemix.kernel.gshell.log;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
-import org.apache.geronimo.gshell.support.OsgiCommandSupport;
-import org.apache.servicemix.gshell.log.layout.PatternConverter;
-import org.apache.servicemix.gshell.log.layout.PatternParser;
+import org.apache.servicemix.kernel.gshell.log.layout.PatternConverter;
+import org.apache.servicemix.kernel.gshell.log.layout.PatternParser;
+import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
/**
* Displays the last log entries
*/
-@CommandComponent(id = "log:display", description = "Display log entries")
public class DisplayLog extends OsgiCommandSupport {
@Option(name = "-n", description="Number of entries to display")
@@ -39,14 +37,6 @@
protected LruList<PaxLoggingEvent> events;
- @Override
- protected OsgiCommandSupport createCommand() throws Exception {
- DisplayLog command = new DisplayLog();
- command.setEvents(getEvents());
- command.setPattern(getPattern());
- return command;
- }
-
public LruList<PaxLoggingEvent> getEvents() {
return events;
}
@@ -82,7 +72,7 @@
}
io.out.println();
- return SUCCESS;
+ return Result.SUCCESS;
}
}
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/GetLogLevel.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/GetLogLevel.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/GetLogLevel.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/GetLogLevel.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/GetLogLevel.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/GetLogLevel.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/GetLogLevel.java Thu Oct 23 10:54:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.log;
+package org.apache.servicemix.kernel.gshell.log;
import java.util.List;
import java.util.Dictionary;
@@ -23,18 +23,14 @@
import java.util.Enumeration;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
-import org.apache.geronimo.gshell.support.OsgiCommandSupport;
-import org.osgi.framework.Bundle;
+import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
-import org.osgi.service.log.LogReaderService;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.Configuration;
/**
* Get the log level for a given logger
*/
-@CommandComponent(id = "log:get", description = "Show Log Level")
public class GetLogLevel extends OsgiCommandSupport {
@Argument(required = false, description = "Logger name, ALL or ROOT (default)")
@@ -96,7 +92,7 @@
}
io.out.println(st);
}
- return SUCCESS;
+ return Result.SUCCESS;
}
protected String getLevel(String prop) {
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/LruList.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/LruList.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/LruList.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/LruList.java Thu Oct 23 10:54:10 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.gshell.log;
+package org.apache.servicemix.kernel.gshell.log;
import java.util.AbstractList;
import java.util.List;
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/SetLogLevel.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/SetLogLevel.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/SetLogLevel.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/SetLogLevel.java Thu Oct 23 10:54:10 2008
@@ -14,14 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.log;
+package org.apache.servicemix.kernel.gshell.log;
import java.util.Dictionary;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
-import org.apache.geronimo.gshell.support.OsgiCommandSupport;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.clp.Option;
+import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.cm.Configuration;
import org.osgi.framework.ServiceReference;
@@ -29,7 +27,6 @@
/**
* Set the log level for a given logger
*/
-@CommandComponent(id = "log:set", description = "Change the log level")
public class SetLogLevel extends OsgiCommandSupport {
@Argument(index = 0, required = true, description = "Level (TRACE, DEBUG, INFO, WARN, ERROR or - to unset")
@@ -61,11 +58,11 @@
!ERROR.equals(level) &&
!INHERITED.equals(level)) {
io.err.println("level must be set to TRACE, DEBUG, INFO, WARN or ERROR (or - to unset it)");
- return FAILURE;
+ return Result.FAILURE;
}
if (INHERITED.equals(level) && logger == null) {
io.err.println("Can not unset the ROOT logger");
- return FAILURE;
+ return Result.FAILURE;
}
ConfigurationAdmin cfgAdmin = getConfigAdmin();
@@ -111,7 +108,7 @@
}
cfg.update(props);
- return SUCCESS;
+ return Result.SUCCESS;
}
protected ConfigurationAdmin getConfigAdmin() {
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/VmLogAppender.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/VmLogAppender.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/VmLogAppender.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/VmLogAppender.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/VmLogAppender.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/VmLogAppender.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/VmLogAppender.java Thu Oct 23 10:54:10 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.gshell.log;
+package org.apache.servicemix.kernel.gshell.log;
import org.ops4j.pax.logging.spi.PaxAppender;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/AbsoluteTimeDateFormat.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/AbsoluteTimeDateFormat.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/AbsoluteTimeDateFormat.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/AbsoluteTimeDateFormat.java Thu Oct 23 10:54:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.log.layout;
+package org.apache.servicemix.kernel.gshell.log.layout;
import java.util.Date;
import java.util.Calendar;
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/DateTimeDateFormat.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/DateTimeDateFormat.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/DateTimeDateFormat.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/DateTimeDateFormat.java Thu Oct 23 10:54:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.log.layout;
+package org.apache.servicemix.kernel.gshell.log.layout;
import java.util.Calendar;
import java.util.TimeZone;
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/FormattingInfo.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/FormattingInfo.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/FormattingInfo.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/FormattingInfo.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/FormattingInfo.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/FormattingInfo.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/FormattingInfo.java Thu Oct 23 10:54:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.log.layout;
+package org.apache.servicemix.kernel.gshell.log.layout;
/**
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/ISO8601DateFormat.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/ISO8601DateFormat.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/ISO8601DateFormat.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/ISO8601DateFormat.java Thu Oct 23 10:54:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.log.layout;
+package org.apache.servicemix.kernel.gshell.log.layout;
import java.util.Calendar;
import java.util.TimeZone;
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternConverter.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/PatternConverter.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternConverter.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternConverter.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/PatternConverter.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/PatternConverter.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternConverter.java Thu Oct 23 10:54:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.log.layout;
+package org.apache.servicemix.kernel.gshell.log.layout;
import org.ops4j.pax.logging.spi.PaxLoggingEvent;
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/PatternParser.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/PatternParser.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/gshell/log/layout/PatternParser.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/java/org/apache/servicemix/kernel/gshell/log/layout/PatternParser.java Thu Oct 23 10:54:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.servicemix.gshell.log.layout;
+package org.apache.servicemix.kernel.gshell.log.layout;
import org.apache.log4j.spi.LoggingEvent;
import org.apache.log4j.spi.LocationInfo;
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml?rev=707428&r1=707427&r2=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-log/src/main/resources/META-INF/spring/gshell-log.xml Thu Oct 23 10:54:10 2008
@@ -22,66 +22,49 @@
xmlns:osgi="http://www.springframework.org/schema/osgi"
xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:gshell="http://servicemix.apache.org/schema/servicemix-gshell"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util.xsd
http://www.springframework.org/schema/osgi
http://www.springframework.org/schema/osgi/spring-osgi.xsd
http://www.springframework.org/schema/osgi-compendium
- http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd">
-
- <bean id="display-log" class="org.apache.servicemix.gshell.log.DisplayLog">
- <property name="events" ref="events" />
- <property name="pattern" value="${pattern}" />
- </bean>
-
- <bean id="display-exception" class="org.apache.servicemix.gshell.log.DisplayException">
- <property name="events" ref="events" />
- </bean>
+ http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
+ http://www.springframework.org/schema/util
+ http://www.springframework.org/schema/util/spring-util.xsd
+ http://servicemix.apache.org/schema/servicemix-gshell
+ http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
- <bean id="get-log-level" class="org.apache.servicemix.gshell.log.GetLogLevel" />
+ <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
- <bean id="set-log-level" class="org.apache.servicemix.gshell.log.SetLogLevel" />
+ <gshell:command-bundle>
+ <gshell:command name="log/d">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.log.DisplayLog">
+ <property name="events" ref="events" />
+ <property name="pattern" value="${pattern}" />
+ </gshell:action>
+ </gshell:command>
+ <gshell:command name="log/de">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.log.DisplayException">
+ <property name="events" ref="events" />
+ </gshell:action>
+ </gshell:command>
+ <gshell:command name="log/get">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.log.GetLogLevel" />
+ </gshell:command>
+ <gshell:command name="log/set">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.log.SetLogLevel" />
+ </gshell:command>
+ </gshell:command-bundle>
- <bean id="vmLogAppender" class="org.apache.servicemix.gshell.log.VmLogAppender">
+ <bean id="vmLogAppender" class="org.apache.servicemix.kernel.gshell.log.VmLogAppender">
<property name="events" ref="events" />
</bean>
- <bean id="events" class="org.apache.servicemix.gshell.log.LruList">
+ <bean id="events" class="org.apache.servicemix.kernel.gshell.log.LruList">
<constructor-arg value="${size}" />
</bean>
- <osgi:service ref="display-log" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="log"/>
- <entry key="alias" value="display"/>
- <entry key="alias" value="d"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="display-exception" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="log"/>
- <entry key="alias" value="de"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="get-log-level" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="log"/>
- <entry key="alias" value="get"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="set-log-level" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="log"/>
- <entry key="alias" value="set"/>
- </osgi:service-properties>
- </osgi:service>
-
<osgi:service ref="vmLogAppender" interface="org.ops4j.pax.logging.spi.PaxAppender">
<osgi:service-properties>
<entry>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-obr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/pom.xml?rev=707428&r1=707427&r2=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/pom.xml Thu Oct 23 10:54:10 2008
@@ -69,7 +69,11 @@
<instructions>
<Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
<Export-Package>org.apache.geronimo.gshell.obr*;version=${project.version}</Export-Package>
- <Import-Package>*</Import-Package>
+ <Import-Package>
+ org.apache.geronimo.gshell.wisdom.command,
+ org.apache.servicemix.kernel.gshell.core,
+ *
+ </Import-Package>
<Private-Package>!*</Private-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/AddUrlCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/AddUrlCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/AddUrlCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/AddUrlCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/AddUrlCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/AddUrlCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/AddUrlCommand.java Thu Oct 23 10:54:10 2008
@@ -14,16 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.gshell.obr;
+package org.apache.servicemix.kernel.gshell.obr;
import java.net.URL;
import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.osgi.service.obr.RepositoryAdmin;
-@CommandComponent(id="obr:addUrl", description="Add a list of repository URLs to the repository service")
public class AddUrlCommand extends ObrCommandSupport {
@Argument(required = true, multiValued = true, description = "Repository URLs")
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/DeployCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/DeployCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/DeployCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/DeployCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/DeployCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/DeployCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/DeployCommand.java Thu Oct 23 10:54:10 2008
@@ -14,18 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.gshell.obr;
+package org.apache.servicemix.kernel.gshell.obr;
import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.osgi.service.obr.RepositoryAdmin;
-import org.osgi.service.obr.Requirement;
-import org.osgi.service.obr.Resolver;
-import org.osgi.service.obr.Resource;
-@CommandComponent(id="obr:deploy", description="Deploy")
public class DeployCommand extends ObrCommandSupport {
@Argument(required = true, multiValued = true, description = "List of bundles")
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/FileUtil.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/FileUtil.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/FileUtil.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/FileUtil.java Thu Oct 23 10:54:10 2008
@@ -16,13 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.geronimo.gshell.obr;
+package org.apache.servicemix.kernel.gshell.obr;
-import java.io.*;
import java.net.URL;
import java.net.URLConnection;
import java.util.jar.JarEntry;
import java.util.jar.JarInputStream;
+import java.io.PrintWriter;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.BufferedOutputStream;
public class FileUtil
{
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/InfoCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/InfoCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/InfoCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/InfoCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/InfoCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/InfoCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/InfoCommand.java Thu Oct 23 10:54:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.gshell.obr;
+package org.apache.servicemix.kernel.gshell.obr;
import java.io.PrintWriter;
import java.lang.reflect.Array;
@@ -23,13 +23,11 @@
import java.util.Map;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.osgi.service.obr.Capability;
import org.osgi.service.obr.RepositoryAdmin;
import org.osgi.service.obr.Requirement;
import org.osgi.service.obr.Resource;
-@CommandComponent(id="obr:info", description="Display the meta-data for the specified bundles.")
public class InfoCommand extends ObrCommandSupport {
@Argument(required = true, multiValued = true)
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ListCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ListCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ListCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListCommand.java Thu Oct 23 10:54:10 2008
@@ -14,19 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.gshell.obr;
+package org.apache.servicemix.kernel.gshell.obr;
-import java.io.StreamTokenizer;
-import java.io.StringReader;
import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.osgi.framework.Version;
import org.osgi.service.obr.RepositoryAdmin;
import org.osgi.service.obr.Resource;
-@CommandComponent(id="obr:list", description="List")
public class ListCommand extends ObrCommandSupport {
@Argument(required = false, multiValued = true)
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListUrlCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ListUrlCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListUrlCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListUrlCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ListUrlCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ListUrlCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ListUrlCommand.java Thu Oct 23 10:54:10 2008
@@ -14,13 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.gshell.obr;
+package org.apache.servicemix.kernel.gshell.obr;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.osgi.service.obr.Repository;
import org.osgi.service.obr.RepositoryAdmin;
-@CommandComponent(id="obr:listUrl", description="Display the repository URLs currently associated with the repository service.")
public class ListUrlCommand extends ObrCommandSupport {
protected void doExecute(RepositoryAdmin admin) {
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ObrCommandSupport.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ObrCommandSupport.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ObrCommandSupport.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/ObrCommandSupport.java Thu Oct 23 10:54:10 2008
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.gshell.obr;
+package org.apache.servicemix.kernel.gshell.obr;
import java.io.PrintWriter;
import java.util.List;
-import org.apache.geronimo.gshell.support.OsgiCommandSupport;
import org.osgi.framework.Bundle;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.Version;
@@ -27,14 +26,8 @@
import org.osgi.service.obr.Requirement;
import org.osgi.service.obr.Resolver;
import org.osgi.service.obr.Resource;
+import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
-/**
- * Created by IntelliJ IDEA.
- * User: gnodet
- * Date: Nov 29, 2007
- * Time: 4:51:56 PM
- * To change this template use File | Settings | File Templates.
- */
public abstract class ObrCommandSupport extends OsgiCommandSupport {
protected static final char VERSION_DELIM = ',';
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RefreshUrlCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/RefreshUrlCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RefreshUrlCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RefreshUrlCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/RefreshUrlCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/RefreshUrlCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RefreshUrlCommand.java Thu Oct 23 10:54:10 2008
@@ -14,17 +14,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.gshell.obr;
+package org.apache.servicemix.kernel.gshell.obr;
import java.net.URL;
import java.util.List;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.osgi.service.obr.Repository;
import org.osgi.service.obr.RepositoryAdmin;
-@CommandComponent(id="obr:refreshUrl", description="Refresh a list of repository URLs to the repository service")
public class RefreshUrlCommand extends ObrCommandSupport {
@Argument(required = false, multiValued = true, description = "Repository URLs (leave empty for all)")
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RemoveUrlCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/RemoveUrlCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RemoveUrlCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RemoveUrlCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/RemoveUrlCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/RemoveUrlCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/RemoveUrlCommand.java Thu Oct 23 10:54:10 2008
@@ -14,16 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.gshell.obr;
+package org.apache.servicemix.kernel.gshell.obr;
import java.net.URL;
import java.util.List;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.clp.Argument;
import org.osgi.service.obr.RepositoryAdmin;
-@CommandComponent(id="obr:removeUrl", description="Remove a list of repository URLs from the repository service")
public class RemoveUrlCommand extends ObrCommandSupport {
@Argument(required = true, multiValued = true, description = "Repository URLs")
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/SourceCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/SourceCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/SourceCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/SourceCommand.java Thu Oct 23 10:54:10 2008
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.gshell.obr;
+package org.apache.servicemix.kernel.gshell.obr;
import java.io.File;
import java.net.URL;
@@ -22,13 +22,9 @@
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.Version;
import org.osgi.service.obr.RepositoryAdmin;
import org.osgi.service.obr.Resource;
-@CommandComponent(id="obr:source", description="Source")
public class SourceCommand extends ObrCommandSupport {
@Option(name = "-x", description = "Extract")
Copied: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/StartCommand.java (from r707425, servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/StartCommand.java)
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/StartCommand.java?p2=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/StartCommand.java&p1=servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/StartCommand.java&r1=707425&r2=707428&rev=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/StartCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/java/org/apache/servicemix/kernel/gshell/obr/StartCommand.java Thu Oct 23 10:54:10 2008
@@ -14,12 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.geronimo.gshell.obr;
+package org.apache.servicemix.kernel.gshell.obr;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.osgi.service.obr.RepositoryAdmin;
-@CommandComponent(id="obr:start", description="Start")
public class StartCommand extends DeployCommand {
protected void doExecute(RepositoryAdmin admin) throws Exception {
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml?rev=707428&r1=707427&r2=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml Thu Oct 23 10:54:10 2008
@@ -20,94 +20,51 @@
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:osgi="http://www.springframework.org/schema/osgi"
+ xmlns:osgix="http://www.springframework.org/schema/osgi-compendium"
xmlns:util="http://www.springframework.org/schema/util"
+ xmlns:gshell="http://servicemix.apache.org/schema/servicemix-gshell"
xsi:schemaLocation="
http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://www.springframework.org/schema/osgi
+ http://www.springframework.org/schema/osgi/spring-osgi.xsd
+ http://www.springframework.org/schema/osgi-compendium
+ http://www.springframework.org/schema/osgi-compendium/spring-osgi-compendium.xsd
http://www.springframework.org/schema/util
http://www.springframework.org/schema/util/spring-util.xsd
- http://www.springframework.org/schema/osgi
- http://www.springframework.org/schema/osgi/spring-osgi.xsd">
-
- <bean id="addUrl" class="org.apache.geronimo.gshell.obr.AddUrlCommand" />
-
- <bean id="deploy" class="org.apache.geronimo.gshell.obr.DeployCommand" />
-
- <bean id="info" class="org.apache.geronimo.gshell.obr.InfoCommand" />
-
- <bean id="list" class="org.apache.geronimo.gshell.obr.ListCommand" />
-
- <bean id="listUrl" class="org.apache.geronimo.gshell.obr.ListUrlCommand" />
-
- <bean id="removeUrl" class="org.apache.geronimo.gshell.obr.RemoveUrlCommand" />
-
- <bean id="refreshUrl" class="org.apache.geronimo.gshell.obr.RefreshUrlCommand" />
-
- <bean id="source" class="org.apache.geronimo.gshell.obr.SourceCommand" />
-
- <bean id="start" class="org.apache.geronimo.gshell.obr.StartCommand" />
-
- <osgi:service ref="addUrl" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="obr"/>
- <entry key="alias" value="addUrl"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="deploy" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="obr"/>
- <entry key="alias" value="deploy"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="info" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="obr"/>
- <entry key="alias" value="info"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="list" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="obr"/>
- <entry key="alias" value="list"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="listUrl" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="obr"/>
- <entry key="alias" value="listUrl"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="removeUrl" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="obr"/>
- <entry key="alias" value="removeUrl"/>
- </osgi:service-properties>
- </osgi:service>
-
- <osgi:service ref="refreshUrl" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="obr"/>
- <entry key="alias" value="refreshUrl"/>
- </osgi:service-properties>
- </osgi:service>
+ http://servicemix.apache.org/schema/servicemix-gshell
+ http://servicemix.apache.org/schema/servicemix-gshell/servicemix-gshell.xsd">
- <osgi:service ref="source" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="obr"/>
- <entry key="alias" value="source"/>
- </osgi:service-properties>
- </osgi:service>
+ <import resource="classpath:org/apache/servicemix/kernel/gshell/core/commands.xml" />
- <osgi:service ref="start" interface="org.apache.geronimo.gshell.command.Command">
- <osgi:service-properties>
- <entry key="shell" value="obr"/>
- <entry key="alias" value="start"/>
- </osgi:service-properties>
- </osgi:service>
+ <gshell:command-bundle>
+ <gshell:command name="obr/addUrl">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.obr.AddUrlCommand" />
+ </gshell:command>
+ <gshell:command name="obr/deploy">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.obr.DeployCommand" />
+ </gshell:command>
+ <gshell:command name="obr/info">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.obr.InfoCommand" />
+ </gshell:command>
+ <gshell:command name="obr/list">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.obr.ListCommand" />
+ </gshell:command>
+ <gshell:command name="obr/listUrl">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.obr.ListUrlCommand" />
+ </gshell:command>
+ <gshell:command name="obr/removeUrl">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.obr.RemoveUrlCommand" />
+ </gshell:command>
+ <gshell:command name="obr/refreshUrl">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.obr.RefreshUrlCommand" />
+ </gshell:command>
+ <gshell:command name="obr/source">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.obr.SourceCommand" />
+ </gshell:command>
+ <gshell:command name="obr/start">
+ <gshell:action class="org.apache.servicemix.kernel.gshell.obr.StartCommand" />
+ </gshell:command>
+ </gshell:command-bundle>
</beans>
\ No newline at end of file
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-packages/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-packages/pom.xml?rev=707428&r1=707427&r2=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-packages/pom.xml (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-packages/pom.xml Thu Oct 23 10:54:10 2008
@@ -72,7 +72,12 @@
<Export-Package>
org.apache.servicemix.kernel.gshell.packages*;version=${project.version};-split-package:=merge-first
</Export-Package>
- <Import-Package>*</Import-Package>
+ <Import-Package>
+ org.apache.geronimo.gshell.wisdom.command,
+ org.apache.servicemix.kernel.gshell.core,
+ org.ops4j.pax.logging,
+ *
+ </Import-Package>
<Private-Package>!*</Private-Package>
<Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java?rev=707428&r1=707427&r2=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ExportsCommand.java Thu Oct 23 10:54:10 2008
@@ -23,11 +23,9 @@
import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.clp.Argument;
import org.apache.geronimo.gshell.clp.Option;
-@CommandComponent(id="package:exports", description="List exported packages")
public class ExportsCommand extends PackageCommandSupport {
@Option(name = "-i", aliases = { "--imports"}, description = "List bundles importing the packages")
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java?rev=707428&r1=707427&r2=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/ImportsCommand.java Thu Oct 23 10:54:10 2008
@@ -26,11 +26,8 @@
import org.osgi.service.packageadmin.ExportedPackage;
import org.osgi.framework.Bundle;
import org.osgi.framework.Constants;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
import org.apache.geronimo.gshell.clp.Argument;
-import org.apache.geronimo.gshell.clp.Option;
-@CommandComponent(id="package:imports", description="List imported packages")
public class ImportsCommand extends PackageCommandSupport {
@Argument(required = false, multiValued = true, description = "bundle ids")
Modified: servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/PackageCommandSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/PackageCommandSupport.java?rev=707428&r1=707427&r2=707428&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/PackageCommandSupport.java (original)
+++ servicemix/smx4/kernel/trunk/gshell/gshell-packages/src/main/java/org/apache/servicemix/kernel/gshell/packages/PackageCommandSupport.java Thu Oct 23 10:54:10 2008
@@ -16,7 +16,7 @@
*/
package org.apache.servicemix.kernel.gshell.packages;
-import org.apache.geronimo.gshell.support.OsgiCommandSupport;
+import org.apache.servicemix.kernel.gshell.core.OsgiCommandSupport;
import org.osgi.framework.ServiceReference;
import org.osgi.service.packageadmin.PackageAdmin;