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 2007/12/21 01:39:48 UTC
svn commit: r606077 - in /servicemix/smx4/runtime/trunk/gshell:
gshell-core/pom.xml
gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java
gshell-features/pom.xml gshell-obr/pom.xml gshell-osgi/pom.xml
gshell-wrapper/pom.xml
Author: gnodet
Date: Thu Dec 20 16:39:46 2007
New Revision: 606077
URL: http://svn.apache.org/viewvc?rev=606077&view=rev
Log:
Make sure all commands are registered when the command line is executed by starting spring context synchronously and waiting for the framework started event
Modified:
servicemix/smx4/runtime/trunk/gshell/gshell-core/pom.xml
servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java
servicemix/smx4/runtime/trunk/gshell/gshell-features/pom.xml
servicemix/smx4/runtime/trunk/gshell/gshell-obr/pom.xml
servicemix/smx4/runtime/trunk/gshell/gshell-osgi/pom.xml
servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/pom.xml
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-core/pom.xml?rev=606077&r1=606076&r2=606077&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-core/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-core/pom.xml Thu Dec 20 16:39:46 2007
@@ -1,228 +1,228 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <!--
-
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>gshell</artifactId>
- <version>1.0-m1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
- <packaging>bundle</packaging>
- <name>ServiceMix Runtime :: GShell Core</name>
-
- <description>
- Provides the OSGi GShell integration
- </description>
-
- <properties>
- <gshell.osgi.import>
- org.apache.servicemix.runtime.main.spi.*;resolution:=optional,
- com.thoughtworks.xstream*;resolution:=optional,
- javax.xml.stream*;resolution:=optional,
- junit.framework*;resolution:=optional,
- nu.xom*;resolution:=optional,
- net.sf.cglib*;resolution:=optional,
- org.codehaus.jettison*;resolution:=optional,
- org.codehaus.plexus*;resolution:=optional,
- org.apache.mina*;resolution:=optional,
- org.dom4j*;resolution:=optional,
- org.joda*;resolution:=optional,
- org.jdom*;resolution:=optional,
- sun.*;resolution:=optional,
- *
- </gshell.osgi.import>
- <gshell.osgi.export>
- org.apache.geronimo.gshell*,
- </gshell.osgi.export>
- <gshell.osgi.private>
- jline*,
- org.apache.commons.jexl*,
- org.codehaus.plexus.personality.plexus.lifecycle.phase*,
- org.codehaus.plexus.util*,
- META-INF.spring*
- </gshell.osgi.private>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.servicemix.runtime</groupId>
- <artifactId>org.apache.servicemix.runtime.main</artifactId>
- <version>1.0-m1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.cglib-${cglib.version}</artifactId>
- <version>1.0-m1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- <version>${spring.osgi.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-core</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-command-api</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-common</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-ansi</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-i18n</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell.support</groupId>
- <artifactId>gshell-clp</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-parser</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-whisper</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-whisper</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell.remote</groupId>
- <artifactId>gshell-remote-client</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell.remote</groupId>
- <artifactId>gshell-remote-common</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.gshell.remote</groupId>
- <artifactId>gshell-remote-server</artifactId>
- <version>${gshell.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-jexl</groupId>
- <artifactId>commons-jexl</artifactId>
- <version>1.1</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>jline</groupId>
- <artifactId>jline</artifactId>
- <version>0.9.91</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-component-api</artifactId>
- <version>1.0-alpha-32</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.4.5</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-aop</artifactId>
- <version>${spring.version}</version>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.4.3</version>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>${pom.basedir}/src/main/resources</directory>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- <resource>
- <directory>${pom.basedir}/src/main/filtered-resources</directory>
- <filtering>true</filtering>
- <includes>
- <include>**/*</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <configuration>
- <mainClass>Main</mainClass>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Import-Package>${gshell.osgi.import}</Import-Package>
- <DynamicImport-Package>sun.misc.*</DynamicImport-Package>
- <Export-Package>${gshell.osgi.export}</Export-Package>
- <Private-Package>${gshell.osgi.private}</Private-Package>
- <Spring-Context>*;publish-context:=false</Spring-Context>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>gshell</artifactId>
+ <version>1.0-m1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
+ <packaging>bundle</packaging>
+ <name>ServiceMix Runtime :: GShell Core</name>
+
+ <description>
+ Provides the OSGi GShell integration
+ </description>
+
+ <properties>
+ <gshell.osgi.import>
+ org.apache.servicemix.runtime.main.spi.*;resolution:=optional,
+ com.thoughtworks.xstream*;resolution:=optional,
+ javax.xml.stream*;resolution:=optional,
+ junit.framework*;resolution:=optional,
+ nu.xom*;resolution:=optional,
+ net.sf.cglib*;resolution:=optional,
+ org.codehaus.jettison*;resolution:=optional,
+ org.codehaus.plexus*;resolution:=optional,
+ org.apache.mina*;resolution:=optional,
+ org.dom4j*;resolution:=optional,
+ org.joda*;resolution:=optional,
+ org.jdom*;resolution:=optional,
+ sun.*;resolution:=optional,
+ *
+ </gshell.osgi.import>
+ <gshell.osgi.export>
+ org.apache.geronimo.gshell*,
+ </gshell.osgi.export>
+ <gshell.osgi.private>
+ jline*,
+ org.apache.commons.jexl*,
+ org.codehaus.plexus.personality.plexus.lifecycle.phase*,
+ org.codehaus.plexus.util*,
+ META-INF.spring*
+ </gshell.osgi.private>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.runtime</groupId>
+ <artifactId>org.apache.servicemix.runtime.main</artifactId>
+ <version>1.0-m1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.cglib-${cglib.version}</artifactId>
+ <version>1.0-m1-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell-core</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell-command-api</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-common</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-ansi</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-i18n</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.support</groupId>
+ <artifactId>gshell-clp</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell-parser</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell-whisper</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell</groupId>
+ <artifactId>gshell-whisper</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.remote</groupId>
+ <artifactId>gshell-remote-client</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.remote</groupId>
+ <artifactId>gshell-remote-common</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.gshell.remote</groupId>
+ <artifactId>gshell-remote-server</artifactId>
+ <version>${gshell.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-jexl</groupId>
+ <artifactId>commons-jexl</artifactId>
+ <version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>jline</groupId>
+ <artifactId>jline</artifactId>
+ <version>0.9.91</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ <version>1.0-alpha-32</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.4.3</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>${pom.basedir}/src/main/resources</directory>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ <resource>
+ <directory>${pom.basedir}/src/main/filtered-resources</directory>
+ <filtering>true</filtering>
+ <includes>
+ <include>**/*</include>
+ </includes>
+ </resource>
+ </resources>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <configuration>
+ <mainClass>Main</mainClass>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Import-Package>${gshell.osgi.import}</Import-Package>
+ <DynamicImport-Package>sun.misc.*</DynamicImport-Package>
+ <Export-Package>${gshell.osgi.export}</Export-Package>
+ <Private-Package>${gshell.osgi.private}</Private-Package>
+ <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java?rev=606077&r1=606076&r2=606077&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java Thu Dec 20 16:39:46 2007
@@ -17,6 +17,7 @@
package org.apache.geronimo.gshell.spring;
import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
import org.apache.geronimo.gshell.DefaultEnvironment;
import org.apache.geronimo.gshell.ExitNotification;
@@ -27,6 +28,8 @@
import org.apache.servicemix.runtime.main.spi.MainService;
import org.osgi.framework.BundleContext;
import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkEvent;
+import org.osgi.framework.FrameworkListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.osgi.context.BundleContextAware;
@@ -133,20 +136,20 @@
* @throws InterruptedException
*/
private void waitForFrameworkToStart() throws InterruptedException {
-// getBundleContext().addFrameworkListener(new FrameworkListener(){
-// public void frameworkEvent(FrameworkEvent event) {
-// System.out.println("Got event: "+event.getType());
-// if( event.getType() == FrameworkEvent.STARTED ) {
-// frameworkStarted.countDown();
-// }
-// }
-// });
-//
-// if( frameworkStarted.await(5, TimeUnit.SECONDS) ) {
-// System.out.println("System completed startup.");
-// } else {
-// System.out.println("System took too long startup... continuing");
-// }
+ getBundleContext().addFrameworkListener(new FrameworkListener(){
+ public void frameworkEvent(FrameworkEvent event) {
+ System.out.println("Got event: "+event.getType());
+ if( event.getType() == FrameworkEvent.STARTED ) {
+ frameworkStarted.countDown();
+ }
+ }
+ });
+
+ if( frameworkStarted.await(5, TimeUnit.SECONDS) ) {
+ System.out.println("System completed startup.");
+ } else {
+ System.out.println("System took too long startup... continuing");
+ }
}
public MainService getMainService() {
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-features/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-features/pom.xml?rev=606077&r1=606076&r2=606077&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-features/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-features/pom.xml Thu Dec 20 16:39:46 2007
@@ -1,90 +1,90 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <!--
-
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>gshell</artifactId>
- <version>1.0-m1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>org.apache.servicemix.runtime.gshell.features</artifactId>
- <packaging>bundle</packaging>
- <name>ServiceMix Runtime :: GShell Features</name>
-
- <description>
- Provides Features in GShell
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${felix.osgi.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>${felix.bundlerepository.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
- <version>1.0-m1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>org.apache.servicemix.runtime.gshell.obr</artifactId>
- <version>1.0-m1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- <version>${spring.osgi.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.servicemix.gshell.features*;version=${project.version}</Export-Package>
- <Import-Package>*</Import-Package>
- <Private-Package>!*</Private-Package>
- <Spring-Context>*;publish-context:=false</Spring-Context>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>gshell</artifactId>
+ <version>1.0-m1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.features</artifactId>
+ <packaging>bundle</packaging>
+ <name>ServiceMix Runtime :: GShell Features</name>
+
+ <description>
+ Provides Features in GShell
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${felix.osgi.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>${felix.bundlerepository.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
+ <version>1.0-m1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.obr</artifactId>
+ <version>1.0-m1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Export-Package>org.apache.servicemix.gshell.features*;version=${project.version}</Export-Package>
+ <Import-Package>*</Import-Package>
+ <Private-Package>!*</Private-Package>
+ <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-obr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-obr/pom.xml?rev=606077&r1=606076&r2=606077&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-obr/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-obr/pom.xml Thu Dec 20 16:39:46 2007
@@ -1,84 +1,84 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <!--
-
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>gshell</artifactId>
- <version>1.0-m1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>org.apache.servicemix.runtime.gshell.obr</artifactId>
- <packaging>bundle</packaging>
- <name>ServiceMix Runtime :: GShell OBR Commands</name>
-
- <description>
- Provides the OBR GShell commands
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${felix.osgi.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.bundlerepository</artifactId>
- <version>${felix.bundlerepository.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
- <version>1.0-m1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- <version>${spring.osgi.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.geronimo.gshell.obr*;version=${project.version}</Export-Package>
- <Import-Package>*</Import-Package>
- <Private-Package>!*</Private-Package>
- <Spring-Context>*;publish-context:=false</Spring-Context>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>gshell</artifactId>
+ <version>1.0-m1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.obr</artifactId>
+ <packaging>bundle</packaging>
+ <name>ServiceMix Runtime :: GShell OBR Commands</name>
+
+ <description>
+ Provides the OBR GShell commands
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${felix.osgi.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.bundlerepository</artifactId>
+ <version>${felix.bundlerepository.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
+ <version>1.0-m1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Export-Package>org.apache.geronimo.gshell.obr*;version=${project.version}</Export-Package>
+ <Import-Package>*</Import-Package>
+ <Private-Package>!*</Private-Package>
+ <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-osgi/pom.xml?rev=606077&r1=606076&r2=606077&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-osgi/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-osgi/pom.xml Thu Dec 20 16:39:46 2007
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <!--
-
- 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.
- -->
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>gshell</artifactId>
- <version>1.0-m1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>org.apache.servicemix.runtime.gshell.osgi</artifactId>
- <packaging>bundle</packaging>
- <name>ServiceMix Runtime :: GShell OSGi Commands</name>
-
- <description>
- Provides the OSGi GShell commands
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.servicemix.runtime.gshell</groupId>
- <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
- <version>1.0-m1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <version>${felix.osgi.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.springframework.osgi</groupId>
- <artifactId>spring-osgi-core</artifactId>
- <version>${spring.osgi.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <configuration>
- <instructions>
- <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
- <Export-Package>org.apache.geronimo.gshell.osgi*;version=${project.version}</Export-Package>
- <Import-Package>*</Import-Package>
- <Private-Package>!*</Private-Package>
- <Spring-Context>*;publish-context:=false</Spring-Context>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+
+ 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.
+ -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>gshell</artifactId>
+ <version>1.0-m1-SNAPSHOT</version>
+ </parent>
+
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.osgi</artifactId>
+ <packaging>bundle</packaging>
+ <name>ServiceMix Runtime :: GShell OSGi Commands</name>
+
+ <description>
+ Provides the OSGi GShell commands
+ </description>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.runtime.gshell</groupId>
+ <artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
+ <version>1.0-m1-SNAPSHOT</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${felix.osgi.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.osgi</groupId>
+ <artifactId>spring-osgi-core</artifactId>
+ <version>${spring.osgi.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName>
+ <Export-Package>org.apache.geronimo.gshell.osgi*;version=${project.version}</Export-Package>
+ <Import-Package>*</Import-Package>
+ <Private-Package>!*</Private-Package>
+ <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/pom.xml?rev=606077&r1=606076&r2=606077&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-wrapper/pom.xml Thu Dec 20 16:39:46 2007
@@ -103,7 +103,7 @@
<Export-Package>org.apache.servicemix.runtime.gshell.wrapper.*;version=${project.version}</Export-Package>
<Import-Package>*</Import-Package>
<Private-Package>!*</Private-Package>
- <Spring-Context>*;publish-context:=false</Spring-Context>
+ <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
</instructions>
</configuration>
</plugin>