servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r606278 [1/4] - in /servicemix/smx4/runtime/trunk: bundles/ bundles/aopalliance/ bundles/asm/ bundles/cglib/ bundles/junit/ bundles/mina/ bundles/xstream/ gshell/ gshell/gshell-core/ gshell/gshell-core/src/main/filtered-resources/org/apache...
Date Fri, 21 Dec 2007 19:25:13 GMT
Author: chirino
Date: Fri Dec 21 11:25:07 2007
New Revision: 606278

URL: http://svn.apache.org/viewvc?rev=606278&view=rev
Log:
Ran svn propset svn:eol-style native 

Modified:
    servicemix/smx4/runtime/trunk/bundles/aopalliance/pom.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/bundles/asm/pom.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/bundles/cglib/pom.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/bundles/junit/pom.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/bundles/mina/pom.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/bundles/pom.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/bundles/xstream/pom.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/pom.xml   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/branding/servicemix-version.properties   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/ServiceMixBranding.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/InfoCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/client/SpringRshCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/server/handler/SpringCloseShellHandler.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/server/handler/SpringExecuteHandler.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/server/handler/SpringOpenShellHandler.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/EnvironmentTargetSource.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java   (contents, props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/IOTargetSource.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandExecutor.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandLineBuilder.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandRegistry.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringRshServer.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/support/OsgiCommandSupport.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/SpringTransportFactoryLocator.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/SpringBaseTransportFactory.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SpringSslTransportFactory.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/SpringTcpTransportFactory.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/SpringVmTransportFactory.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/pom.xml   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/FeaturesService.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Repository.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/CommandProxy.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/RepositoryImpl.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/AddUrlCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/FeaturesCommandSupport.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListUrlCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/RemoveUrlCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-obr/pom.xml   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/AddUrlCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/DeployCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/FileUtil.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/InfoCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ListCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ListUrlCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ObrCommandSupport.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/RemoveUrlCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/SourceCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/StartCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/pom.xml   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/BundleCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/BundleLevel.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/BundlesCommand.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Headers.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/InstallBundle.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ListBundles.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ListServices.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/RefreshBundle.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/ResolveBundle.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Shutdown.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StartBundle.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StartLevel.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/StopBundle.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/UninstallBundle.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Util.java   (props changed)
    servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/resources/META-INF/spring/gshell-osgi.xml   (props changed)
    servicemix/smx4/runtime/trunk/gshell/pom.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/gshell/src/test/configs/services/org.apache.servicemix.shell.properties   (props changed)
    servicemix/smx4/runtime/trunk/gshell/src/test/configs/services/org.ops4j.pax.logging.properties   (props changed)
    servicemix/smx4/runtime/trunk/main/pom.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/main/src/main/java/org/apache/servicemix/runtime/main/Main.java   (contents, props changed)
    servicemix/smx4/runtime/trunk/main/src/main/java/org/apache/servicemix/runtime/main/spi/MainService.java   (contents, props changed)
    servicemix/smx4/runtime/trunk/main/src/main/resources/config.properties   (props changed)
    servicemix/smx4/runtime/trunk/testing/depends-maven-plugin/pom.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/testing/depends-maven-plugin/src/main/java/org/apache/servicemix/tooling/depends/GenerateDependsFileMojo.java   (props changed)
    servicemix/smx4/runtime/trunk/testing/pom.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/testing/support/pom.xml   (contents, props changed)
    servicemix/smx4/runtime/trunk/testing/support/src/main/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTest.java   (props changed)
    servicemix/smx4/runtime/trunk/testing/support/src/main/java/org/apache/servicemix/runtime/testing/support/Counter.java   (props changed)
    servicemix/smx4/runtime/trunk/testing/support/src/test/java/org/apache/servicemix/runtime/testing/support/AbstractIntegrationTestTest.java   (props changed)

Modified: servicemix/smx4/runtime/trunk/bundles/aopalliance/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/aopalliance/pom.xml?rev=606278&r1=606277&r2=606278&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/aopalliance/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/aopalliance/pom.xml Fri Dec 21 11:25:07 2007
@@ -1,60 +1,60 @@
-<?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.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0-m1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
-    <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
-    </description>
-
-    <properties>
-        <pkgArtifactId>aopalliance</pkgArtifactId>
-        <pkgVersion>${aopalliance.version}</pkgVersion>
-        <servicemix.osgi.export.pkg>org.aopalliance</servicemix.osgi.export.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>aopalliance</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
+<?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.bundles</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0-m1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
+    <packaging>bundle</packaging>
+    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgArtifactId>aopalliance</pkgArtifactId>
+        <pkgVersion>${aopalliance.version}</pkgVersion>
+        <servicemix.osgi.export.pkg>org.aopalliance</servicemix.osgi.export.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>aopalliance</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: servicemix/smx4/runtime/trunk/bundles/aopalliance/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: servicemix/smx4/runtime/trunk/bundles/asm/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/asm/pom.xml?rev=606278&r1=606277&r2=606278&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/asm/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/asm/pom.xml Fri Dec 21 11:25:07 2007
@@ -1,60 +1,60 @@
-<?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.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0-m1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
-    <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
-    </description>
-
-    <properties>
-        <pkgArtifactId>asm</pkgArtifactId>
-        <pkgVersion>${asm.version}</pkgVersion>
-        <servicemix.osgi.export.pkg>org.objectweb.asm</servicemix.osgi.export.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>asm</groupId>
-            <artifactId>asm-all</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
+<?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.bundles</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0-m1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
+    <packaging>bundle</packaging>
+    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgArtifactId>asm</pkgArtifactId>
+        <pkgVersion>${asm.version}</pkgVersion>
+        <servicemix.osgi.export.pkg>org.objectweb.asm</servicemix.osgi.export.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>asm</groupId>
+            <artifactId>asm-all</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: servicemix/smx4/runtime/trunk/bundles/asm/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: servicemix/smx4/runtime/trunk/bundles/cglib/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/cglib/pom.xml?rev=606278&r1=606277&r2=606278&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/cglib/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/cglib/pom.xml Fri Dec 21 11:25:07 2007
@@ -1,66 +1,66 @@
-<?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.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0-m1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
-    <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
-    </description>
-
-    <properties>
-        <pkgArtifactId>cglib</pkgArtifactId>
-        <pkgVersion>${cglib.version}</pkgVersion>
-        <servicemix.osgi.export.pkg>net.sf.cglib</servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg>
-            net.sf.cglib.asm.util;resolution:=optional,
-            org.apache.tools.ant*;resolution:=optional,
-            org.codehaus.aspectwerkz.hook;resolution:=optional,
-            *
-        </servicemix.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>cglib</groupId>
-            <artifactId>cglib-nodep</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
+<?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.bundles</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0-m1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
+    <packaging>bundle</packaging>
+    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgArtifactId>cglib</pkgArtifactId>
+        <pkgVersion>${cglib.version}</pkgVersion>
+        <servicemix.osgi.export.pkg>net.sf.cglib</servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            net.sf.cglib.asm.util;resolution:=optional,
+            org.apache.tools.ant*;resolution:=optional,
+            org.codehaus.aspectwerkz.hook;resolution:=optional,
+            *
+        </servicemix.osgi.import.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>cglib</groupId>
+            <artifactId>cglib-nodep</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: servicemix/smx4/runtime/trunk/bundles/cglib/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: servicemix/smx4/runtime/trunk/bundles/junit/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/junit/pom.xml?rev=606278&r1=606277&r2=606278&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/junit/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/junit/pom.xml Fri Dec 21 11:25:07 2007
@@ -1,61 +1,61 @@
-<?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.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0-m1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
-    <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
-    </description>
-
-    <properties>
-        <pkgArtifactId>junit</pkgArtifactId>
-        <pkgVersion>${junit.version}</pkgVersion>
-        <servicemix.osgi.export>
-            org.junit*;version=${pkgVersion},
-            junit*;version=${pkgVersion}
-        </servicemix.osgi.export>
-        <servicemix.osgi.import.pkg>
-            org.hamcrest*;resolution:=optional,
-            *
-        </servicemix.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-    </dependencies>
-
-</project>
+<?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.bundles</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0-m1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
+    <packaging>bundle</packaging>
+    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgArtifactId>junit</pkgArtifactId>
+        <pkgVersion>${junit.version}</pkgVersion>
+        <servicemix.osgi.export>
+            org.junit*;version=${pkgVersion},
+            junit*;version=${pkgVersion}
+        </servicemix.osgi.export>
+        <servicemix.osgi.import.pkg>
+            org.hamcrest*;resolution:=optional,
+            *
+        </servicemix.osgi.import.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: servicemix/smx4/runtime/trunk/bundles/junit/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: servicemix/smx4/runtime/trunk/bundles/mina/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/mina/pom.xml?rev=606278&r1=606277&r2=606278&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/mina/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/mina/pom.xml Fri Dec 21 11:25:07 2007
@@ -1,97 +1,97 @@
-<?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.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0-m1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
-    <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
-    </description>
-
-    <properties>
-        <pkgArtifactId>mina</pkgArtifactId>
-        <pkgVersion>${mina.version}</pkgVersion>
-        <servicemix.osgi.export.pkg>
-            org.apache.mina
-	    </servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg>
-            com.jcraft.jzlib*;resolution:=optional,
-            net.gleamynode.netty2*;resolution:=optional,
-            *
-        </servicemix.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-core</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-filter-codec-netty</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-filter-compression</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-filter-ssl</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-integration-jmx</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.mina</groupId>
-            <artifactId>mina-integration-spring</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
+<?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.bundles</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0-m1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
+    <packaging>bundle</packaging>
+    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgArtifactId>mina</pkgArtifactId>
+        <pkgVersion>${mina.version}</pkgVersion>
+        <servicemix.osgi.export.pkg>
+            org.apache.mina
+	    </servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg>
+            com.jcraft.jzlib*;resolution:=optional,
+            net.gleamynode.netty2*;resolution:=optional,
+            *
+        </servicemix.osgi.import.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-core</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-filter-codec-netty</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-filter-compression</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-filter-ssl</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-integration-jmx</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.mina</groupId>
+            <artifactId>mina-integration-spring</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: servicemix/smx4/runtime/trunk/bundles/mina/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: servicemix/smx4/runtime/trunk/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/pom.xml?rev=606278&r1=606277&r2=606278&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/pom.xml Fri Dec 21 11:25:07 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</groupId>
-        <artifactId>runtime</artifactId>
-        <version>1.0-m1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.runtime.bundles</groupId>
-    <artifactId>bundles</artifactId>
-    <packaging>pom</packaging>
-    <name>ServiceMix OSGI Common Bundles</name>
-
-    <modules>
-        <module>ant</module>
-        <module>aopalliance</module>
-        <module>asm</module>
-        <module>cglib</module>
-        <module>junit</module>
-        <module>mina</module>
-        <module>xstream</module>
-    </modules>
-
-    <properties>
-        <servicemix.osgi.export>${servicemix.osgi.export.pkg}*;version=${pkgVersion}</servicemix.osgi.export>
-        <servicemix.osgi.export.pkg></servicemix.osgi.export.pkg>
-        <servicemix.osgi.import.pkg></servicemix.osgi.import.pkg>
-        <servicemix.osgi.private.pkg></servicemix.osgi.private.pkg>
-    </properties>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>bundle</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Export-Package>${servicemix.osgi.export}</Export-Package>
-                        <Import-Package>${servicemix.osgi.import.pkg}*</Import-Package>
-                        <Private-Package>${servicemix.osgi.private.pkg}</Private-Package>
-                    </instructions>
-                    <unpackBundle>true</unpackBundle>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>
+<?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</groupId>
+        <artifactId>runtime</artifactId>
+        <version>1.0-m1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.runtime.bundles</groupId>
+    <artifactId>bundles</artifactId>
+    <packaging>pom</packaging>
+    <name>ServiceMix OSGI Common Bundles</name>
+
+    <modules>
+        <module>ant</module>
+        <module>aopalliance</module>
+        <module>asm</module>
+        <module>cglib</module>
+        <module>junit</module>
+        <module>mina</module>
+        <module>xstream</module>
+    </modules>
+
+    <properties>
+        <servicemix.osgi.export>${servicemix.osgi.export.pkg}*;version=${pkgVersion}</servicemix.osgi.export>
+        <servicemix.osgi.export.pkg></servicemix.osgi.export.pkg>
+        <servicemix.osgi.import.pkg></servicemix.osgi.import.pkg>
+        <servicemix.osgi.private.pkg></servicemix.osgi.private.pkg>
+    </properties>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>bundle</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+                        <Export-Package>${servicemix.osgi.export}</Export-Package>
+                        <Import-Package>${servicemix.osgi.import.pkg}*</Import-Package>
+                        <Private-Package>${servicemix.osgi.private.pkg}</Private-Package>
+                    </instructions>
+                    <unpackBundle>true</unpackBundle>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: servicemix/smx4/runtime/trunk/bundles/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: servicemix/smx4/runtime/trunk/bundles/xstream/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/bundles/xstream/pom.xml?rev=606278&r1=606277&r2=606278&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/bundles/xstream/pom.xml (original)
+++ servicemix/smx4/runtime/trunk/bundles/xstream/pom.xml Fri Dec 21 11:25:07 2007
@@ -1,71 +1,71 @@
-<?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.bundles</groupId>
-        <artifactId>bundles</artifactId>
-        <version>1.0-m1-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.apache.servicemix.bundles</groupId>
-    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
-    <packaging>bundle</packaging>
-    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
-    <description>
-        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
-    </description>
-
-    <properties>
-        <pkgArtifactId>xstream</pkgArtifactId>
-        <pkgVersion>${xstream.version}</pkgVersion>
-        <servicemix.osgi.import.pkg>
-            net.sf.cglib*;resolution:=optional,
-            nu.xom*;resolution:=optional,
-            org.codehaus.aspectwerkz*;resolution:=optional,
-            org.codehaus.jettison*;resolution:=optional,
-            org.dom4j*;resolution:=optional,
-            org.jdom*;resolution:=optional,
-            org.joda.time*;resolution:=optional,
-            org.xmlpull*;resolution:=optional,
-            sun*;resolution:=optional,
-            *
-        </servicemix.osgi.import.pkg>
-    </properties>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.thoughtworks.xstream</groupId>
-            <artifactId>${pkgArtifactId}</artifactId>
-            <version>${pkgVersion}</version>
-            <optional>true</optional>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
-
-</project>
+<?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.bundles</groupId>
+        <artifactId>bundles</artifactId>
+        <version>1.0-m1-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.bundles</groupId>
+    <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
+    <packaging>bundle</packaging>
+    <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
+    <description>
+        This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
+    </description>
+
+    <properties>
+        <pkgArtifactId>xstream</pkgArtifactId>
+        <pkgVersion>${xstream.version}</pkgVersion>
+        <servicemix.osgi.import.pkg>
+            net.sf.cglib*;resolution:=optional,
+            nu.xom*;resolution:=optional,
+            org.codehaus.aspectwerkz*;resolution:=optional,
+            org.codehaus.jettison*;resolution:=optional,
+            org.dom4j*;resolution:=optional,
+            org.jdom*;resolution:=optional,
+            org.joda.time*;resolution:=optional,
+            org.xmlpull*;resolution:=optional,
+            sun*;resolution:=optional,
+            *
+        </servicemix.osgi.import.pkg>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>${pkgArtifactId}</artifactId>
+            <version>${pkgVersion}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+</project>

Propchange: servicemix/smx4/runtime/trunk/bundles/xstream/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/filtered-resources/org/apache/geronimo/gshell/branding/servicemix-version.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/ServiceMixBranding.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/ClearCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/EchoCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/ExitCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/HelpCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/InfoCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SetCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/SourceCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/commands/builtins/UnsetCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/client/SpringRshCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/server/handler/SpringCloseShellHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/server/handler/SpringExecuteHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/server/handler/SpringOpenShellHandler.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/EnvironmentTargetSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

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=606278&r1=606277&r2=606278&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 Fri Dec 21 11:25:07 2007
@@ -1,171 +1,171 @@
-/*
- * 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.
- */
-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;
-import org.apache.geronimo.gshell.command.IO;
-import org.apache.geronimo.gshell.common.Arguments;
-import org.apache.geronimo.gshell.shell.Environment;
-import org.apache.geronimo.gshell.shell.InteractiveShell;
-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;
-
-/**
- * This class represents the local shell console and is also used when passing a command to execute on the command line.
- * Such mechanism is done using the {@link MainService} service registered in the OSGi registry, which contains the
- * command line arguments and a place holder for the exit code.
- */
-public class GShell implements Runnable, BundleContextAware {
-
-    private static final Logger log = LoggerFactory.getLogger(GShell.class);
-
-    private InteractiveShell shell;
-    private Thread thread;
-    private IO io;
-    private Environment env;
-    private boolean start;
-    private MainService mainService;
-    private BundleContext bundleContext;
-    private CountDownLatch frameworkStarted;
-
-    public GShell(InteractiveShell shell) {
-        this.shell = shell;
-        this.io = new IO(System.in, System.out, System.err);
-        this.env = new DefaultEnvironment(io);
-    }
-
-    public void setStart(boolean start) {
-        this.start = start;
-    }
-
-    public void start() {
-        frameworkStarted = new CountDownLatch(1);
-        if (start) {
-            thread = new Thread(this);
-            thread.start();
-        }
-    }
-
-    public void stop() throws InterruptedException {
-        if (thread != null) {
-            frameworkStarted.countDown();
-            thread.interrupt();
-            thread.join();
-            thread = null;
-        }
-        Thread.dumpStack();
-    }
-
-    public void run() {
-        try {
-            IOTargetSource.setIO(io);
-            EnvironmentTargetSource.setEnvironment(env);
-
-            String[] args = null;
-            if (mainService != null) {
-                args = mainService.getArgs();
-            }
-
-            // If a command was specified on the command line, then just execute that command.
-            if (args != null && args.length > 0) {
-                waitForFrameworkToStart();
-                log.info("Executing Shell with arguments: " + Arguments.asString(args));
-                Object value = shell.execute((Object[]) args);
-                if (mainService != null) {
-                    if (value instanceof Number) {
-                        mainService.setExitCode(((Number) value).intValue());
-                    } else {
-                        mainService.setExitCode(value != null ? 1 : 0);
-                    }
-                }
-            } else {
-                // Otherwise go into a command shell.
-                shell.run();
-                if (mainService != null) {
-                    mainService.setExitCode(0);
-                }
-            }
-
-        } catch (ExitNotification e) {
-            if (mainService != null) {
-                mainService.setExitCode(0);
-            }
-            log.info("Exiting shell due received exit notification");
-        } catch (Exception e) {
-            if (mainService != null) {
-                mainService.setExitCode(-1);
-            }
-            log.info("Exiting shell due to caught exception " + e, e);
-        } finally {
-            try {
-                getBundleContext().getBundle(0).stop();
-            } catch (BundleException e) {
-                log.info("Caught exception while shutting down framework: " + e, e);
-            }
-        }
-    }
-
-    /**
-     * Blocks until the framework has finished starting.  We do this so that any installed
-     * bundles for commands get fully registered.
-     *
-     * @throws InterruptedException
-     */
-    private void waitForFrameworkToStart() throws InterruptedException {
-		getBundleContext().addFrameworkListener(new FrameworkListener(){
-			public void frameworkEvent(FrameworkEvent event) {
-				log.debug("Got event: " + event.getType());
-				if( event.getType() == FrameworkEvent.STARTED ) {
-					frameworkStarted.countDown();
-				}
-			}
-		});
-
-		if( frameworkStarted.await(5, TimeUnit.SECONDS) ) {
-			log.info("System completed startup.");
-		} else {
-			log.warn("System took too long startup... continuing");
-		}
-    }
-
-    public MainService getMainService() {
-        return mainService;
-    }
-
-    public void setMainService(MainService main) {
-        this.mainService = main;
-    }
-
-    public void setBundleContext(BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
-
-    public BundleContext getBundleContext() {
-        return bundleContext;
-	}
-
-}
+/*
+ * 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.
+ */
+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;
+import org.apache.geronimo.gshell.command.IO;
+import org.apache.geronimo.gshell.common.Arguments;
+import org.apache.geronimo.gshell.shell.Environment;
+import org.apache.geronimo.gshell.shell.InteractiveShell;
+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;
+
+/**
+ * This class represents the local shell console and is also used when passing a command to execute on the command line.
+ * Such mechanism is done using the {@link MainService} service registered in the OSGi registry, which contains the
+ * command line arguments and a place holder for the exit code.
+ */
+public class GShell implements Runnable, BundleContextAware {
+
+    private static final Logger log = LoggerFactory.getLogger(GShell.class);
+
+    private InteractiveShell shell;
+    private Thread thread;
+    private IO io;
+    private Environment env;
+    private boolean start;
+    private MainService mainService;
+    private BundleContext bundleContext;
+    private CountDownLatch frameworkStarted;
+
+    public GShell(InteractiveShell shell) {
+        this.shell = shell;
+        this.io = new IO(System.in, System.out, System.err);
+        this.env = new DefaultEnvironment(io);
+    }
+
+    public void setStart(boolean start) {
+        this.start = start;
+    }
+
+    public void start() {
+        frameworkStarted = new CountDownLatch(1);
+        if (start) {
+            thread = new Thread(this);
+            thread.start();
+        }
+    }
+
+    public void stop() throws InterruptedException {
+        if (thread != null) {
+            frameworkStarted.countDown();
+            thread.interrupt();
+            thread.join();
+            thread = null;
+        }
+        Thread.dumpStack();
+    }
+
+    public void run() {
+        try {
+            IOTargetSource.setIO(io);
+            EnvironmentTargetSource.setEnvironment(env);
+
+            String[] args = null;
+            if (mainService != null) {
+                args = mainService.getArgs();
+            }
+
+            // If a command was specified on the command line, then just execute that command.
+            if (args != null && args.length > 0) {
+                waitForFrameworkToStart();
+                log.info("Executing Shell with arguments: " + Arguments.asString(args));
+                Object value = shell.execute((Object[]) args);
+                if (mainService != null) {
+                    if (value instanceof Number) {
+                        mainService.setExitCode(((Number) value).intValue());
+                    } else {
+                        mainService.setExitCode(value != null ? 1 : 0);
+                    }
+                }
+            } else {
+                // Otherwise go into a command shell.
+                shell.run();
+                if (mainService != null) {
+                    mainService.setExitCode(0);
+                }
+            }
+
+        } catch (ExitNotification e) {
+            if (mainService != null) {
+                mainService.setExitCode(0);
+            }
+            log.info("Exiting shell due received exit notification");
+        } catch (Exception e) {
+            if (mainService != null) {
+                mainService.setExitCode(-1);
+            }
+            log.info("Exiting shell due to caught exception " + e, e);
+        } finally {
+            try {
+                getBundleContext().getBundle(0).stop();
+            } catch (BundleException e) {
+                log.info("Caught exception while shutting down framework: " + e, e);
+            }
+        }
+    }
+
+    /**
+     * Blocks until the framework has finished starting.  We do this so that any installed
+     * bundles for commands get fully registered.
+     *
+     * @throws InterruptedException
+     */
+    private void waitForFrameworkToStart() throws InterruptedException {
+		getBundleContext().addFrameworkListener(new FrameworkListener(){
+			public void frameworkEvent(FrameworkEvent event) {
+				log.debug("Got event: " + event.getType());
+				if( event.getType() == FrameworkEvent.STARTED ) {
+					frameworkStarted.countDown();
+				}
+			}
+		});
+
+		if( frameworkStarted.await(5, TimeUnit.SECONDS) ) {
+			log.info("System completed startup.");
+		} else {
+			log.warn("System took too long startup... continuing");
+		}
+    }
+
+    public MainService getMainService() {
+        return mainService;
+    }
+
+    public void setMainService(MainService main) {
+        this.mainService = main;
+    }
+
+    public void setBundleContext(BundleContext bundleContext) {
+        this.bundleContext = bundleContext;
+    }
+
+    public BundleContext getBundleContext() {
+        return bundleContext;
+	}
+
+}

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/IOTargetSource.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandExecutor.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandLineBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringCommandRegistry.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringRshServer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/support/OsgiCommandSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/SpringTransportFactoryLocator.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/base/SpringBaseTransportFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SpringSslTransportFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/SpringTcpTransportFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/SpringVmTransportFactory.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-commands.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml?rev=606278&r1=606277&r2=606278&view=diff
==============================================================================
--- servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml (original)
+++ servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml Fri Dec 21 11:25:07 2007
@@ -1,43 +1,43 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-    Licensed to the Apache Software Foundation (ASF) under one or more
-    contributor license agreements.  See the NOTICE file distributed with
-    this work for additional information regarding copyright ownership.
-    The ASF licenses this file to You under the Apache License, Version 2.0
-    (the "License"); you may not use this file except in compliance with
-    the License.  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:util="http://www.springframework.org/schema/util"
-       xmlns:osgi="http://www.springframework.org/schema/osgi"
-       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">
-
-
-    <osgi:reference id="mainService" interface="org.apache.servicemix.runtime.main.spi.MainService" />
-
-    <bean id="gshell" class="org.apache.geronimo.gshell.spring.GShell"
-                      init-method="start" destroy-method="stop">
-        <constructor-arg ref="interactiveShell" />
-        <property name="start" value="${startLocalConsole}" />
-        <property name="mainService" ref="mainService" />
-    </bean>
-    
-
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:util="http://www.springframework.org/schema/util"
+       xmlns:osgi="http://www.springframework.org/schema/osgi"
+       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">
+
+
+    <osgi:reference id="mainService" interface="org.apache.servicemix.runtime.main.spi.MainService" />
+
+    <bean id="gshell" class="org.apache.geronimo.gshell.spring.GShell"
+                      init-method="start" destroy-method="stop">
+        <constructor-arg ref="interactiveShell" />
+        <property name="start" value="${startLocalConsole}" />
+        <property name="mainService" ref="mainService" />
+    </bean>
+    
+
 </beans>

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-osgi.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-remote.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-core/src/main/resources/META-INF/spring/gshell.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Feature.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/FeaturesService.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/Repository.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/CommandProxy.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeatureImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/FeaturesServiceImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/RepositoryImpl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/AddUrlCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/FeaturesCommandSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/ListUrlCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/java/org/apache/servicemix/gshell/features/internal/commands/RemoveUrlCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-features/src/main/resources/META-INF/spring/gshell-features.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-obr/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/AddUrlCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/DeployCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/FileUtil.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/InfoCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ListCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ListUrlCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/ObrCommandSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/RemoveUrlCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/SourceCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/java/org/apache/geronimo/gshell/obr/StartCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-obr/src/main/resources/META-INF/spring/gshell-obr.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-osgi/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/BundleCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/BundleLevel.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/BundlesCommand.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: servicemix/smx4/runtime/trunk/gshell/gshell-osgi/src/main/java/org/apache/geronimo/gshell/osgi/Headers.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message