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/07 22:13:00 UTC
svn commit: r602224 - in /servicemix/branches/servicemix-4.0/runtime: ./
assembly/ assembly/src/ assembly/src/main/descriptors/
assembly/src/main/release/etc/ gshell/ gshell/gshell-core/
gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/brand...
Author: gnodet
Date: Fri Dec 7 13:12:57 2007
New Revision: 602224
URL: http://svn.apache.org/viewvc?rev=602224&view=rev
Log:
Rename minimum to assembly, add runtime in main package, add ASL headers
Added:
servicemix/branches/servicemix-4.0/runtime/LICENSE.txt
servicemix/branches/servicemix-4.0/runtime/NOTICE.txt
servicemix/branches/servicemix-4.0/runtime/README.txt
servicemix/branches/servicemix-4.0/runtime/assembly/
- copied from r602176, servicemix/branches/servicemix-4.0/runtime/minimum/
servicemix/branches/servicemix-4.0/runtime/assembly/expand-camel-example
- copied unchanged from r602223, servicemix/branches/servicemix-4.0/runtime/minimum/expand-camel-example
servicemix/branches/servicemix-4.0/runtime/assembly/install-camel
- copied unchanged from r602223, servicemix/branches/servicemix-4.0/runtime/minimum/install-camel
servicemix/branches/servicemix-4.0/runtime/assembly/install-camel-example
- copied unchanged from r602223, servicemix/branches/servicemix-4.0/runtime/minimum/install-camel-example
servicemix/branches/servicemix-4.0/runtime/assembly/pom.xml
- copied, changed from r602223, servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml
servicemix/branches/servicemix-4.0/runtime/assembly/rebuild
- copied unchanged from r602223, servicemix/branches/servicemix-4.0/runtime/minimum/rebuild
servicemix/branches/servicemix-4.0/runtime/assembly/src/
- copied from r602223, servicemix/branches/servicemix-4.0/runtime/minimum/src/
servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/
servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/main/
- copied from r602176, servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/main/
servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/main/Main.java
- copied, changed from r602223, servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/main/Main.java
servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/main/spi/
- copied from r602223, servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/main/spi/
Removed:
servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/main/
servicemix/branches/servicemix-4.0/runtime/minimum/
Modified:
servicemix/branches/servicemix-4.0/runtime/assembly/src/main/descriptors/windows-bin.xml
servicemix/branches/servicemix-4.0/runtime/assembly/src/main/release/etc/config.properties
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/pom.xml
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/ServiceMixBranding.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/osgi/SubShell.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/client/SpringRshCommand.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ExitCommand.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/HelpCommand.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/OsgiLayoutManager.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ShellContext.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringRshServer.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SubShellHelpCommand.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SpringSslTransportFactory.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/SpringTcpTransportFactory.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/SpringVmTransportFactory.java
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/pom.xml
servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/pom.xml
servicemix/branches/servicemix-4.0/runtime/gshell/pom.xml
servicemix/branches/servicemix-4.0/runtime/main/pom.xml
servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/main/spi/MainService.java
servicemix/branches/servicemix-4.0/runtime/pom.xml
Added: servicemix/branches/servicemix-4.0/runtime/LICENSE.txt
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/LICENSE.txt?rev=602224&view=auto
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/LICENSE.txt (added)
+++ servicemix/branches/servicemix-4.0/runtime/LICENSE.txt Fri Dec 7 13:12:57 2007
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
+
Added: servicemix/branches/servicemix-4.0/runtime/NOTICE.txt
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/NOTICE.txt?rev=602224&view=auto
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/NOTICE.txt (added)
+++ servicemix/branches/servicemix-4.0/runtime/NOTICE.txt Fri Dec 7 13:12:57 2007
@@ -0,0 +1,8 @@
+ =========================================================================
+ == NOTICE file for use with the Apache License, Version 2.0, ==
+ == in this case for the Apache ServiceMix distribution. ==
+ =========================================================================
+
+ This product contains software developed by
+ The Apache Software Foundation (http://www.apache.org/).
+
Added: servicemix/branches/servicemix-4.0/runtime/README.txt
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/README.txt?rev=602224&view=auto
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/README.txt (added)
+++ servicemix/branches/servicemix-4.0/runtime/README.txt Fri Dec 7 13:12:57 2007
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+Welcome to Apache ServiceMix 4.0!
+=================================
+Apache ServiceMix is an open source distributed Enterprise Service Bus (ESB)
+and SOA toolkit built from the ground up on the semantics and APIs of the Java
+Business Integration (JBI) specification JSR 208 and released under the Apache
+2.0 license.
+
+Apache ServiceMix is lightweight and easily embeddable, has integrated Spring
+support and can be run at the edge of the network (inside a client or server),
+as a standalone ESB provider or as a service within another ESB.
+You can use ServiceMix in Java SE or a Java EE application server.
+
+
+Getting Started
+===============
+To find out how to get started try this
+http://servicemix.apache.org/1-quick-start.html
+
+If you need more help try talking to us on our mailing lists
+http://servicemix.apache.org/mailing-lists.html
+
+
+We welcome contributions
+http://servicemix.apache.org/contributing.html
+
+Many thanks for using Apache ServiceMix.
+
+
+The ServiceMix Team
+http://servicemix.apache.org/team.html
Copied: servicemix/branches/servicemix-4.0/runtime/assembly/pom.xml (from r602223, servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/assembly/pom.xml?p2=servicemix/branches/servicemix-4.0/runtime/assembly/pom.xml&p1=servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml&r1=602223&r2=602224&rev=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/minimum/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/assembly/pom.xml Fri Dec 7 13:12:57 2007
@@ -29,9 +29,9 @@
</parent>
<groupId>org.apache.servicemix.runtime</groupId>
- <artifactId>org.apache.servicemix.runtime.minimum</artifactId>
+ <artifactId>apache-servicemix-runtime</artifactId>
<packaging>pom</packaging>
- <name>ServiceMix Minimum Distribution</name>
+ <name>ServiceMix Runtime :: Assembly</name>
<dependencies>
<dependency>
Modified: servicemix/branches/servicemix-4.0/runtime/assembly/src/main/descriptors/windows-bin.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/assembly/src/main/descriptors/windows-bin.xml?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/assembly/src/main/descriptors/windows-bin.xml Fri Dec 7 13:12:57 2007
@@ -122,8 +122,8 @@
<!-- PAX config -->
<include>org.apache.felix:org.apache.felix.configadmin</include>
- <include>org.apache.servicemix:org.apache.servicemix.runtime.filemonitor</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant</include>
+ <include>org.apache.servicemix.runtime:org.apache.servicemix.runtime.filemonitor</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant-${ant.version}</include>
<!-- Spring OSGi -->
<include>org.springframework:spring-aop</include>
@@ -133,19 +133,19 @@
<include>org.springframework.osgi:spring-osgi-core</include>
<include>org.springframework.osgi:spring-osgi-extender</include>
<include>org.springframework.osgi:spring-osgi-io</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.aopalliance-${aopalliance.version}</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib-${cglib.version}</include>
<!-- GShell -->
<include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina</include>
- <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xstream</include>
- <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.core</include>
- <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.osgi</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.mina-${mina.version}</include>
+ <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.xstream-${xstream.version}</include>
+ <include>org.apache.servicemix.runtime.gshell:org.apache.servicemix.runtime.gshell.core</include>
+ <include>org.apache.servicemix.runtime.gshell:org.apache.servicemix.runtime.gshell.osgi</include>
<!-- OBR + GShell command -->
<include>org.apache.felix:org.apache.felix.bundlerepository</include>
- <include>org.apache.servicemix.gshell:org.apache.servicemix.gshell.obr</include>
+ <include>org.apache.servicemix.runtime.gshell:org.apache.servicemix.runtime.gshell.obr</include>
</includes>
</dependencySet>
Modified: servicemix/branches/servicemix-4.0/runtime/assembly/src/main/release/etc/config.properties
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/assembly/src/main/release/etc/config.properties?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/assembly/src/main/release/etc/config.properties (original)
+++ servicemix/branches/servicemix-4.0/runtime/assembly/src/main/release/etc/config.properties Fri Dec 7 13:12:57 2007
@@ -24,7 +24,7 @@
org.osgi.service.packageadmin; version=1.2.0, \
org.osgi.service.startlevel; version=1.0.0, \
org.osgi.service.url; version=1.0.0, \
- org.apache.servicemix.main.spi; version=1.0.0, \
+ org.apache.servicemix.runtime.main.spi, \
${jre-${java.specification.version}}
#org.osgi.framework.bootdelegation=sun.*,com.sun.*
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/pom.xml?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/pom.xml Fri Dec 7 13:12:57 2007
@@ -31,7 +31,7 @@
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>org.apache.servicemix.runtime.gshell.core</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix GShell Core</name>
+ <name>ServiceMix Runtime :: GShell Core</name>
<description>
Provides the OSGi GShell integration
@@ -39,7 +39,7 @@
<properties>
<gshell.osgi.import>
- org.apache.servicemix.main.spi.*;resolution:=optional,
+ org.apache.servicemix.runtime.main.spi.*;resolution:=optional,
com.thoughtworks.xstream*;resolution:=optional,
javax.xml.stream*;resolution:=optional,
junit.framework*;resolution:=optional,
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/ServiceMixBranding.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/ServiceMixBranding.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/ServiceMixBranding.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/branding/ServiceMixBranding.java Fri Dec 7 13:12:57 2007
@@ -1,3 +1,19 @@
+/*
+ * 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.branding;
import java.io.PrintWriter;
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/osgi/SubShell.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/osgi/SubShell.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/osgi/SubShell.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/osgi/SubShell.java Fri Dec 7 13:12:57 2007
@@ -1,3 +1,19 @@
+/*
+ * 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.osgi;
import org.apache.geronimo.gshell.branding.Branding;
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/client/SpringRshCommand.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/client/SpringRshCommand.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/client/SpringRshCommand.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/remote/client/SpringRshCommand.java Fri Dec 7 13:12:57 2007
@@ -1,3 +1,19 @@
+/*
+ * 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.remote.client;
import java.net.URI;
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ExitCommand.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ExitCommand.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ExitCommand.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ExitCommand.java Fri Dec 7 13:12:57 2007
@@ -1,3 +1,19 @@
+/*
+ * 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 org.apache.geronimo.gshell.ExitNotification;
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/GShell.java Fri Dec 7 13:12:57 2007
@@ -1,164 +1,164 @@
-/*
- * 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.Arrays;
-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.shell.Environment;
-import org.apache.geronimo.gshell.shell.InteractiveShell;
-import org.apache.servicemix.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.springframework.osgi.context.BundleContextAware;
-
-/**
- * Created by IntelliJ IDEA.
- * User: gnodet
- * Date: Oct 11, 2007
- * Time: 10:20:37 PM
- * To change this template use File | Settings | File Templates.
- */
-public class GShell implements Runnable, BundleContextAware {
-
- 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;
- }
- }
-
- 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();
- 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);
- }
- } catch (Exception e) {
- if( mainService!=null ) {
- mainService.setExitCode(-1);
- }
- } finally {
- try {
- getBundleContext().getBundle(0).stop();
- } catch (BundleException e) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- * 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) {
-// 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() {
- 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.Arrays;
+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.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.springframework.osgi.context.BundleContextAware;
+
+/**
+ * Created by IntelliJ IDEA.
+ * User: gnodet
+ * Date: Oct 11, 2007
+ * Time: 10:20:37 PM
+ * To change this template use File | Settings | File Templates.
+ */
+public class GShell implements Runnable, BundleContextAware {
+
+ 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;
+ }
+ }
+
+ 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();
+ 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);
+ }
+ } catch (Exception e) {
+ if( mainService!=null ) {
+ mainService.setExitCode(-1);
+ }
+ } finally {
+ try {
+ getBundleContext().getBundle(0).stop();
+ } catch (BundleException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+
+ /**
+ * 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) {
+// 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() {
+ return mainService;
+ }
+
+ public void setMainService(MainService main) {
+ this.mainService = main;
+ }
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+ public BundleContext getBundleContext() {
+ return bundleContext;
+ }
+
+}
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/HelpCommand.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/HelpCommand.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/HelpCommand.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/HelpCommand.java Fri Dec 7 13:12:57 2007
@@ -1,3 +1,19 @@
+/*
+ * 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.Comparator;
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/OsgiLayoutManager.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/OsgiLayoutManager.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/OsgiLayoutManager.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/OsgiLayoutManager.java Fri Dec 7 13:12:57 2007
@@ -1,23 +1,20 @@
-package org.apache.geronimo.gshell.spring;
/*
- * 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
+ * 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
+ * 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.
+ * 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.HashMap;
import java.util.Map;
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ShellContext.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ShellContext.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ShellContext.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/ShellContext.java Fri Dec 7 13:12:57 2007
@@ -1,3 +1,19 @@
+/*
+ * 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 jline.Terminal;
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringRshServer.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringRshServer.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringRshServer.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SpringRshServer.java Fri Dec 7 13:12:57 2007
@@ -1,3 +1,19 @@
+/*
+ * 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.net.URI;
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SubShellHelpCommand.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SubShellHelpCommand.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SubShellHelpCommand.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/spring/SubShellHelpCommand.java Fri Dec 7 13:12:57 2007
@@ -1,23 +1,20 @@
-package org.apache.geronimo.gshell.spring;
-
/*
- * 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
+ * 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
+ * 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.
+ * 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 org.apache.geronimo.gshell.ansi.Code;
import org.apache.geronimo.gshell.ansi.Renderer;
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SpringSslTransportFactory.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SpringSslTransportFactory.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SpringSslTransportFactory.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/ssl/SpringSslTransportFactory.java Fri Dec 7 13:12:57 2007
@@ -1,3 +1,19 @@
+/*
+ * 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.whisper.transport.ssl;
import org.apache.geronimo.gshell.whisper.transport.tcp.TcpTransport;
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/SpringTcpTransportFactory.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/SpringTcpTransportFactory.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/SpringTcpTransportFactory.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/tcp/SpringTcpTransportFactory.java Fri Dec 7 13:12:57 2007
@@ -1,3 +1,19 @@
+/*
+ * 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.whisper.transport.tcp;
import org.apache.geronimo.gshell.whisper.transport.base.SpringBaseTransportFactory;
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/SpringVmTransportFactory.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/SpringVmTransportFactory.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/SpringVmTransportFactory.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/java/org/apache/geronimo/gshell/whisper/transport/vm/SpringVmTransportFactory.java Fri Dec 7 13:12:57 2007
@@ -1,3 +1,19 @@
+/*
+ * 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.whisper.transport.vm;
import org.apache.geronimo.gshell.whisper.transport.tcp.TcpTransport;
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-core/src/main/resources/META-INF/spring/gshell-local.xml Fri Dec 7 13:12:57 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"
+<?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
+ 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">
+ http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+
+ <osgi:reference id="mainService" interface="org.apache.servicemix.runtime.main.spi.MainService" />
- <osgi:reference id="mainService" interface="org.apache.servicemix.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}" />
+ <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>
-
-
+ </bean>
+
+
</beans>
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/pom.xml?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-obr/pom.xml Fri Dec 7 13:12:57 2007
@@ -31,7 +31,7 @@
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>org.apache.servicemix.runtime.gshell.obr</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix GShell OBR Commands</name>
+ <name>ServiceMix Runtime :: GShell OBR Commands</name>
<description>
Provides the OBR GShell commands
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/pom.xml?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/gshell-osgi/pom.xml Fri Dec 7 13:12:57 2007
@@ -31,7 +31,7 @@
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>org.apache.servicemix.runtime.gshell.osgi</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix GShell OSGi Commands</name>
+ <name>ServiceMix Runtime :: GShell OSGi Commands</name>
<description>
Provides the OSGi GShell commands
Modified: servicemix/branches/servicemix-4.0/runtime/gshell/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/gshell/pom.xml?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/gshell/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/gshell/pom.xml Fri Dec 7 13:12:57 2007
@@ -31,7 +31,7 @@
<groupId>org.apache.servicemix.runtime.gshell</groupId>
<artifactId>gshell</artifactId>
<packaging>pom</packaging>
- <name>ServiceMix GShell</name>
+ <name>ServiceMix Runtime :: GShell</name>
<modules>
<module>gshell-core</module>
Modified: servicemix/branches/servicemix-4.0/runtime/main/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/main/pom.xml?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/main/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/main/pom.xml Fri Dec 7 13:12:57 2007
@@ -30,7 +30,7 @@
<artifactId>org.apache.servicemix.runtime.main</artifactId>
<packaging>bundle</packaging>
- <name>ServiceMix Main</name>
+ <name>ServiceMix Runtime :: Main</name>
<dependencies>
<dependency>
@@ -76,12 +76,13 @@
<configuration>
<instructions>
<_donotcopy>(CVS|.svn|config.properties)</_donotcopy>
- <Main-Class>org.apache.servicemix.main.Main</Main-Class>
+ <Main-Class>org.apache.servicemix.runtime.main.Main</Main-Class>
<Bundle-Name>Apache ServiceMix</Bundle-Name>
<Bundle-Description>OSGi R4 framework.</Bundle-Description>
- <Export-Package>org.apache.servicemix.main.spi.*</Export-Package>
+ <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+ <Export-Package>org.apache.servicemix.runtime.main.spi.*;version=${pom.version}</Export-Package>
<Private-Package>
- org.apache.servicemix.main,
+ org.apache.servicemix.runtime.main,
org.apache.felix.moduleloader.*,
org.apache.felix.framework.*,
org.osgi.framework,
@@ -92,7 +93,7 @@
org.osgi.util.tracker
</Private-Package>
<Import-Package>!*</Import-Package>
- <Include-Resource>{src/main/resources/}</Include-Resource>
+ <Include-Resource>src/main/resources/</Include-Resource>
</instructions>
</configuration>
</plugin>
Copied: servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/main/Main.java (from r602223, servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/main/Main.java)
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/main/Main.java?p2=servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/main/Main.java&p1=servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/main/Main.java&r1=602223&r2=602224&rev=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/main/Main.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/main/Main.java Fri Dec 7 13:12:57 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.main;
+package org.apache.servicemix.runtime.main;
import java.io.*;
import java.net.MalformedURLException;
@@ -27,7 +27,7 @@
import org.apache.felix.framework.Felix;
import org.apache.felix.framework.cache.BundleCache;
import org.apache.felix.framework.util.StringMap;
-import org.apache.servicemix.main.spi.MainService;
+import org.apache.servicemix.runtime.main.spi.MainService;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceRegistration;
Modified: servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/main/spi/MainService.java
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/main/spi/MainService.java?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/main/spi/MainService.java (original)
+++ servicemix/branches/servicemix-4.0/runtime/main/src/main/java/org/apache/servicemix/runtime/main/spi/MainService.java Fri Dec 7 13:12:57 2007
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.servicemix.main.spi;
+package org.apache.servicemix.runtime.main.spi;
public interface MainService {
Modified: servicemix/branches/servicemix-4.0/runtime/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/branches/servicemix-4.0/runtime/pom.xml?rev=602224&r1=602223&r2=602224&view=diff
==============================================================================
--- servicemix/branches/servicemix-4.0/runtime/pom.xml (original)
+++ servicemix/branches/servicemix-4.0/runtime/pom.xml Fri Dec 7 13:12:57 2007
@@ -39,7 +39,7 @@
<module>main</module>
<module>gshell</module>
<module>filemonitor</module>
- <module>minimum</module>
+ <module>assembly</module>
</modules>
<properties>