Author: gnodet
Date: Tue Mar 11 03:41:31 2008
New Revision: 635872
URL: http://svn.apache.org/viewvc?rev=635872&view=rev
Log:
Fix nmr:list command, include all the needed bundles in the distro, enhance
README / RELEASE-NOTES
Modified:
servicemix/smx4/nmr/trunk/README.txt
servicemix/smx4/nmr/trunk/RELEASE-NOTES.txt
servicemix/smx4/nmr/trunk/assembly/pom.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml
servicemix/smx4/nmr/trunk/pom.xml
Modified: servicemix/smx4/nmr/trunk/README.txt
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/README.txt?rev=635872&r1=635871&r2=635872&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/README.txt (original)
+++ servicemix/smx4/nmr/trunk/README.txt Tue Mar 11 03:41:31 2008
@@ -28,6 +28,10 @@
For an Apache ServiceMix NMR binary distribution, please read
RELEASE-NOTES.txt for the list of supported and unsupported features.
+ServiceMix NMR distribution contains a set of OSGi bundles meant to
+be deployed onto an OSGi Runtime, preferably ServiceMix Kernel.
+To deploy the NMR on ServiceMix Kernel, simply copy the bundles inside
+the lib directory into the deploy directory of ServiceMix Kernel.
Alternatively, you can also find out how to get started here:
http://servicemix.apache.org/nmr/
Modified: servicemix/smx4/nmr/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/RELEASE-NOTES.txt?rev=635872&r1=635871&r2=635872&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/RELEASE-NOTES.txt (original)
+++ servicemix/smx4/nmr/trunk/RELEASE-NOTES.txt Tue Mar 11 03:41:31 2008
@@ -26,6 +26,15 @@
questions on the ServiceMix mailing lists or simply to provide feedback
(we appreciate it very much).
+The current feature set includes a JBI container with a few missing things:
+ * no support for JMX deployment and Ant tasks
+ * no support for Service Assemblies Connections
+ * no support for transactions (a transaction manager and a naming context
+ can be injected into components if they are available as OSGi services,
+ but not transaction processing - suspend / resume - will be performed,
+ as it would be requested for real support)
+
+
Thanks you for downloading ServiceMix NMR. Enjoy !
The ServiceMix Team
Modified: servicemix/smx4/nmr/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?rev=635872&r1=635871&r2=635872&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Tue Mar 11 03:41:31 2008
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.servicemix.nmr</groupId>
- <artifactId>nmr</artifactId>
+ <artifactId>nmr-parent</artifactId>
<version>1.0-m1-SNAPSHOT</version>
</parent>
@@ -98,6 +98,26 @@
<groupId>org.apache.servicemix.bundles</groupId>
<artifactId>org.apache.servicemix.bundles.woodstox-3.2.3</artifactId>
<version>${pom.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.prefs</artifactId>
+ <version>${felix.prefs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-activation_1.1_spec</artifactId>
+ <version>${geronimo.activation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ <version>${geronimo.javamail.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ <version>${geronimo.jta.version}</version>
</dependency>
</dependencies>
<build>
Modified: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml?rev=635872&r1=635871&r2=635872&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
(original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml Tue
Mar 11 03:41:31 2008
@@ -105,6 +105,8 @@
<scope>runtime</scope>
<includes>
<include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
Modified:
servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml?rev=635872&r1=635871&r2=635872&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
(original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml Tue
Mar 11 03:41:31 2008
@@ -97,6 +97,8 @@
<scope>runtime</scope>
<includes>
<include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
+
<include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
<include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.woodstox-3.2.3</include>
<include>org.apache.felix:org.apache.felix.prefs</include>
<include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.api</include>
Modified:
servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java?rev=635872&r1=635871&r2=635872&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java
(original)
+++
servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java
Tue Mar 11 03:41:31 2008
@@ -22,11 +22,12 @@
/**
* Displays the name of existing NMR endpoints
*/
[EMAIL PROTECTED](id = "nmr:list", description = "List NMR endpoints")
public class ListCommand extends NmrCommandSupport {
protected Object doExecute() throws Exception {
- io.out.println("Shared Libraries");
- io.out.println("----------------");
+ io.out.println("Endpoints");
+ io.out.println("---------");
ServiceReference[] references =
getBundleContext().getAllServiceReferences(Endpoint.class.getName(), null);
if (references != null) {
for (ServiceReference ref : references) {
Modified:
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml?rev=635872&r1=635871&r2=635872&view=diff
==============================================================================
---
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml
(original)
+++
servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml
Tue Mar 11 03:41:31 2008
@@ -38,5 +38,4 @@
</osgi:service-properties>
</osgi:service>
-
</beans>
Modified: servicemix/smx4/nmr/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=635872&r1=635871&r2=635872&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Tue Mar 11 03:41:31 2008
@@ -74,6 +74,8 @@
<felix.bundlerepository.version>1.0.2</felix.bundlerepository.version>
<felix.prefs.version>1.0.2</felix.prefs.version>
<geronimo.activation.version>1.0.2</geronimo.activation.version>
+ <geronimo.javamail.version>1.2</geronimo.javamail.version>
+ <geronimo.jta.version>1.1.1</geronimo.jta.version>
<geronimo.servlet.version>1.1.2</geronimo.servlet.version>
<geronimo.stax.version>1.0.1</geronimo.stax.version>
<gshell.version>1.0-alpha-1</gshell.version>
