servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r634634 - in /servicemix/smx4/nmr/trunk: ./ assembly/ assembly/src/ assembly/src/main/ assembly/src/main/descriptors/ bundles/ bundles/woodstox/ jbi/ jbi/api/ jbi/commands/ jbi/deployer/ jbi/itests/ jbi/itests/src/test/resources/ jbi/manage...
Date Fri, 07 Mar 2008 12:27:11 GMT
Author: gnodet
Date: Fri Mar  7 04:27:08 2008
New Revision: 634634

URL: http://svn.apache.org/viewvc?rev=634634&view=rev
Log:
Create distributions, update version to 1.0-m1-SNAPSHOT, add a 'nmr list' command

Added:
    servicemix/smx4/nmr/trunk/BUILDING.txt
      - copied, changed from r634214, servicemix/smx4/kernel/trunk/BUILDING.txt
    servicemix/smx4/nmr/trunk/LICENSE.txt
      - copied unchanged from r634214, servicemix/smx4/kernel/trunk/LICENSE.txt
    servicemix/smx4/nmr/trunk/NOTICE.txt
      - copied unchanged from r634214, servicemix/smx4/kernel/trunk/NOTICE.txt
    servicemix/smx4/nmr/trunk/README.txt
      - copied, changed from r634214, servicemix/smx4/kernel/trunk/README.txt
    servicemix/smx4/nmr/trunk/RELEASE-NOTES.txt
      - copied, changed from r634214, servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt
    servicemix/smx4/nmr/trunk/assembly/   (with props)
    servicemix/smx4/nmr/trunk/assembly/pom.xml
      - copied, changed from r634214, servicemix/smx4/kernel/trunk/assembly/pom.xml
    servicemix/smx4/nmr/trunk/assembly/src/
    servicemix/smx4/nmr/trunk/assembly/src/main/
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml
      - copied, changed from r634214, servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-src.xml
      - copied unchanged from r634214, servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-src.xml
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml
      - copied, changed from r634214, servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml
    servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-src.xml
      - copied unchanged from r634214, servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-src.xml
    servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java
Modified:
    servicemix/smx4/nmr/trunk/bundles/pom.xml
    servicemix/smx4/nmr/trunk/bundles/woodstox/pom.xml
    servicemix/smx4/nmr/trunk/jbi/api/pom.xml
    servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
    servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
    servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
    servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/log4j.properties
    servicemix/smx4/nmr/trunk/jbi/management/pom.xml
    servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
    servicemix/smx4/nmr/trunk/jbi/pom.xml
    servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
    servicemix/smx4/nmr/trunk/nmr/api/pom.xml
    servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
    servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java
    servicemix/smx4/nmr/trunk/nmr/commands/src/main/resources/META-INF/spring/servicemix-nmr-commands.xml
    servicemix/smx4/nmr/trunk/nmr/core/pom.xml
    servicemix/smx4/nmr/trunk/nmr/management/pom.xml
    servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
    servicemix/smx4/nmr/trunk/nmr/pom.xml
    servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
    servicemix/smx4/nmr/trunk/pom.xml

Copied: servicemix/smx4/nmr/trunk/BUILDING.txt (from r634214, servicemix/smx4/kernel/trunk/BUILDING.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/BUILDING.txt?p2=servicemix/smx4/nmr/trunk/BUILDING.txt&p1=servicemix/smx4/kernel/trunk/BUILDING.txt&r1=634214&r2=634634&rev=634634&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/BUILDING.txt (original)
+++ servicemix/smx4/nmr/trunk/BUILDING.txt Fri Mar  7 04:27:08 2008
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-Building Apache ServiceMix Kernel
+Building Apache ServiceMix NMR
 ===================================
 
 Initial Setup
@@ -28,7 +28,7 @@
    JDK location, and that your PATH includes %JAVA_HOME%\bin (windows) or 
    $JAVA_HOME$/bin (unix).
 
-3) Install Maven 2.0.7, which can be downloaded from 
+3) Install Maven 2.0.8 or later, which can be downloaded from
    http://maven.apache.org/download.html. Make sure that your PATH includes 
    the MVN_HOME/bin directory. 
 
@@ -36,13 +36,13 @@
 Building
 --------
 
-1) Change to the top level directory of Apache ServiceMix Kernel source distribution.
+1) Change to the top level directory of Apache ServiceMix NMR source distribution.
 2) Run
          $> mvn
-   This will compile Apache ServiceMix Kernel and run all of the tests in the 
-   Apache ServiceMix Kernel source distribution. Alternatively, you can run
+   This will compile Apache ServiceMix NMR and run all of the tests in the
+   Apache ServiceMix NMR source distribution. Alternatively, you can run
          $> mvn -Pfastinstall
-   This will compile Apache ServiceMix Kernel without running the tests and takes less
+   This will compile Apache ServiceMix NMR without running the tests and takes less
    time to build.
    Depending on the load of remote Maven 2.0 repositories, you may have 
    to run "mvn" several times until the required dependencies are 

Copied: servicemix/smx4/nmr/trunk/README.txt (from r634214, servicemix/smx4/kernel/trunk/README.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/README.txt?p2=servicemix/smx4/nmr/trunk/README.txt&p1=servicemix/smx4/kernel/trunk/README.txt&r1=634214&r2=634634&rev=634634&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/README.txt (original)
+++ servicemix/smx4/nmr/trunk/README.txt Fri Mar  7 04:27:08 2008
@@ -15,38 +15,29 @@
  * limitations under the License.
  */
 
-Welcome to Apache ServiceMix Kernel 
+Welcome to Apache ServiceMix NMR
 ====================================
-Apache ServiceMix Kernel is a small OSGi based kernel which provides a 
-lightweight container onto which various bundles can be deployed.
+Apache ServiceMix NMR is a JBI container built as a set of OSGi bundles
+and meant to be deployed on top of Apache ServiceMix Kernel.
 
-The following features are included:
-  * Hot deployment of OSGi bundles
-  * Dynamic reloadable configuration
-  * Provisioning
-  * Native OS integration
-  * Extensible Shell console
-  * Remote access
-  * Managing multiple instances
 
 Getting Started
 ===============
-For an Apache ServiceMix Kernel source distribution, please read 
-BUILDING.txt for instructions on building Apache ServiceMix Kernel. 
+For an Apache ServiceMix NMR source distribution, please read
+BUILDING.txt for instructions on building Apache ServiceMix NMR.
 
-For an Apache ServiceMix Kernel binary distribution, please read 
-RELEASE-NOTES.txt for installation instructions and list of supported 
-and unsupported features.
+For an Apache ServiceMix NMR binary distribution, please read
+RELEASE-NOTES.txt for the list of supported and unsupported features.
 
 Alternatively, you can also find out how to get started here:
-    http://servicemix.apache.org/kernel/
+    http://servicemix.apache.org/nmr/
 
 If you need more help try talking to us on our mailing lists
     http://servicemix.apache.org/mailing-lists.html
 
-If you find any issues with ServiceMix Kernel, please submit reports 
+If you find any issues with ServiceMix NMR, please submit reports 
 with JIRA here:
-    http://issues.apache.org/activemq/browse/SMX4KNL
+    http://issues.apache.org/activemq/browse/SMX4NMR
 
 We welcome contributions, and encourage you to get involved in the 
 ServiceMix community. If you'd like to learn more about how you can 

Copied: servicemix/smx4/nmr/trunk/RELEASE-NOTES.txt (from r634214, servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/RELEASE-NOTES.txt?p2=servicemix/smx4/nmr/trunk/RELEASE-NOTES.txt&p1=servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt&r1=634214&r2=634634&rev=634634&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/RELEASE-NOTES.txt (original)
+++ servicemix/smx4/nmr/trunk/RELEASE-NOTES.txt Fri Mar  7 04:27:08 2008
@@ -15,40 +15,18 @@
  * limitations under the License.
  */
 
-                  Apache ServiceMix Kernel 1.0-m2
+                  Apache ServiceMix NMR 1.0-m1
                   ================================
 
-This is the second milestone of ServiceMix Kernel, but mostly a bug fix release
-compared to the first milestone.
+See the README.txt file for more general informations about ServiceMix NMR.
 
-** Bug
-    * [SMX4KNL-13] - startup issue in recognizing new files in deploy folder
-    * [SMX4KNL-15] - Display of memory size using the info command on Windows is ugly
-    * [SMX4KNL-16] - Bad error message when startup.properties lists a unknown file (the file name is not displayed, but 'null' instead)
-    * [SMX4KNL-18] - No need for DynamicImport-Package=* in filemonitor
-    * [SMX4KNL-19] - Performance problems when using the OSGi classloaders in a certain way
-
-** Improvement
-    * [SMX4KNL-4] - Add a start option on the 'osgi install' command so that the bundle is automatically started
-
-** Task
-    * [SMX4KNL-17] - Remove all the warnings when building the distribution tar.gz
-
-See the README.txt file for more general informations about ServiceMix Kernel.
-
-
-                  Apache ServiceMix Kernel 1.0-m1
-                  ================================
-
-See the README.txt file for more general informations about ServiceMix Kernel.
-
-This is the first milestone of ServiceMix Kernel.  All the features are not 
+This is the first milestone of ServiceMix NMR.  All the features are not
 fully implemented yet and things may be changed until the final 1.0 release.
 Please refer to the web site for more informations and feel free to ask any
 questions on the ServiceMix mailing lists or simply to provide feedback 
 (we appreciate it very much).
 
-Thanks you for downloading ServiceMix Kernel.  Enjoy !
+Thanks you for downloading ServiceMix NMR.  Enjoy !
 
 The ServiceMix Team
 http://servicemix.apache.org/team.html

Propchange: servicemix/smx4/nmr/trunk/assembly/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Mar  7 04:27:08 2008
@@ -0,0 +1,8 @@
+target
+*.iml
+*.ipr
+*.iws
+eclipse_config
+.classpath
+.project
+.settings

Copied: servicemix/smx4/nmr/trunk/assembly/pom.xml (from r634214, servicemix/smx4/kernel/trunk/assembly/pom.xml)
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/assembly/pom.xml?p2=servicemix/smx4/nmr/trunk/assembly/pom.xml&p1=servicemix/smx4/kernel/trunk/assembly/pom.xml&r1=634214&r2=634634&rev=634634&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/pom.xml Fri Mar  7 04:27:08 2008
@@ -22,179 +22,85 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.servicemix.kernel</groupId>
-        <artifactId>kernel</artifactId>
-        <version>1.0-m3-SNAPSHOT</version>
+        <groupId>org.apache.servicemix.nmr</groupId>
+        <artifactId>nmr</artifactId>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
-    <groupId>org.apache.servicemix.kernel</groupId>
-    <artifactId>apache-servicemix-kernel</artifactId>
+    <groupId>org.apache.servicemix.nmr</groupId>
+    <artifactId>apache-servicemix-nmr</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-m3-SNAPSHOT</version>
-    <name>ServiceMix Kernel :: Assembly</name>
+    <version>1.0-m1-SNAPSHOT</version>
+    <name>ServiceMix NMR :: Assembly</name>
 
     <dependencies>
         <dependency>
-            <groupId>org.apache.servicemix.kernel</groupId>
-            <artifactId>org.apache.servicemix.kernel.main</artifactId>
+            <groupId>org.apache.servicemix.nmr</groupId>
+            <artifactId>org.apache.servicemix.nmr.api</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel</groupId>
-            <artifactId>org.apache.servicemix.kernel.filemonitor</artifactId>
+            <groupId>org.apache.servicemix.nmr</groupId>
+            <artifactId>org.apache.servicemix.nmr.commands</artifactId>
             <version>${pom.version}</version>
         </dependency>
         <dependency>
-            <groupId>org.apache.servicemix.kernel</groupId>
-            <artifactId>org.apache.servicemix.kernel.spring</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-extender</artifactId>
-            <version>${spring.osgi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-core</artifactId>
-            <version>${spring.osgi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework.osgi</groupId>
-            <artifactId>spring-osgi-io</artifactId>
-            <version>${spring.osgi.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-context</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-beans</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-core</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-aop</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.springframework</groupId>
-            <artifactId>spring-tx</artifactId>
-            <version>${spring.version}</version>
-        </dependency>
-      <dependency>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.apache.felix.bundlerepository</artifactId>
-          <version>${felix.bundlerepository.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.servicemix.kernel.gshell</groupId>
-          <artifactId>org.apache.servicemix.kernel.gshell.core</artifactId>
-          <version>${pom.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.servicemix.kernel.gshell</groupId>
-          <artifactId>org.apache.servicemix.kernel.gshell.obr</artifactId>
-          <version>${pom.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.servicemix.kernel.gshell</groupId>
-          <artifactId>org.apache.servicemix.kernel.gshell.osgi</artifactId>
-          <version>${pom.version}</version>
-      </dependency>
-        <dependency>
-            <groupId>org.apache.servicemix.kernel.gshell</groupId>
-            <artifactId>org.apache.servicemix.kernel.gshell.features</artifactId>
-            <version>${pom.version}</version>
-        </dependency>
-      <dependency>
-          <groupId>org.apache.servicemix.bundles</groupId>
-          <artifactId>org.apache.servicemix.bundles.mina-1.1.6</artifactId>
-          <version>${pom.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.servicemix.bundles</groupId>
-          <artifactId>org.apache.servicemix.bundles.xstream-1.2.2</artifactId>
-          <version>${pom.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.servicemix.bundles</groupId>
-          <artifactId>org.apache.servicemix.bundles.aopalliance-1.0</artifactId>
-          <version>${pom.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.servicemix.bundles</groupId>
-          <artifactId>org.apache.servicemix.bundles.asm-2.2.3</artifactId>
-          <version>${pom.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.servicemix.bundles</groupId>
-          <artifactId>org.apache.servicemix.bundles.cglib-2.1_3</artifactId>
-          <version>${pom.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.osgi.compendium</artifactId>
-          <version>${felix.compendium.version}</version>
-          <exclusions>
-	         <exclusion>
-	              <groupId>org.apache.felix</groupId>
-    	          <artifactId>javax.servlet</artifactId>
-             </exclusion>
-	         <exclusion>
-	              <groupId>org.apache.felix</groupId>
-    	          <artifactId>org.osgi.foundation</artifactId>
-             </exclusion>
-	      </exclusions>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.felix</groupId>
-          <artifactId>org.apache.felix.configadmin</artifactId>
-          <version>${felix.configadmin.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.ops4j.pax.logging</groupId>
-          <artifactId>pax-logging-api</artifactId>
-          <version>${pax.logging.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.ops4j.pax.logging</groupId>
-          <artifactId>pax-logging-service</artifactId>
-          <version>${pax.logging.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.ops4j.pax.url</groupId>
-          <artifactId>pax-url-mvn</artifactId>
-          <version>${pax.url.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-servlet_2.5_spec</artifactId>
-          <version>${geronimo.servlet.version}</version>
-      </dependency>
-      <dependency>
-          <groupId>org.apache.geronimo.specs</groupId>
-          <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-          <version>${geronimo.stax.version}</version>
-      </dependency>
+            <groupId>org.apache.servicemix.nmr</groupId>
+            <artifactId>org.apache.servicemix.nmr.core</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.nmr</groupId>
+            <artifactId>org.apache.servicemix.nmr.management</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.nmr</groupId>
+            <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.nmr</groupId>
+            <artifactId>org.apache.servicemix.nmr.spring</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.jbi</groupId>
+            <artifactId>org.apache.servicemix.jbi.api</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.jbi</groupId>
+            <artifactId>org.apache.servicemix.jbi.commands</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.jbi</groupId>
+            <artifactId>org.apache.servicemix.jbi.deployer</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.jbi</groupId>
+            <artifactId>org.apache.servicemix.jbi.management</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.jbi</groupId>
+            <artifactId>org.apache.servicemix.jbi.osgi</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.jbi</groupId>
+            <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.woodstox-3.2.3</artifactId>
+            <version>${pom.version}</version>
+        </dependency>
     </dependencies>
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main/filtered-resources</directory>
-                <filtering>true</filtering>
-                <includes>
-                    <include>**/*</include>
-                </includes>
-            </resource>
-        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -206,30 +112,6 @@
                         <goals>
                             <goal>resources</goal>
                         </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>copy</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>org.apache.servicemix.kernel</groupId>
-                                    <artifactId>org.apache.servicemix.kernel.main</artifactId>
-                                    <version>${pom.version}</version>
-                                    <outputDirectory>target/dependencies</outputDirectory>
-                                    <destFileName>servicemix.jar</destFileName>
-                                </artifactItem>
-                            </artifactItems>
-                        </configuration>
                     </execution>
                 </executions>
             </plugin>

Copied: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml (from r634214, servicemix/smx4/kernel/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?p2=servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml&p1=servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml&r1=634214&r2=634634&rev=634634&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/unix-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/unix-bin.xml Fri Mar  7 04:27:08 2008
@@ -100,48 +100,25 @@
 
         <!-- Mandatory bundles for everything -->
         <dependencySet>
-            <outputDirectory>/system</outputDirectory>
+            <outputDirectory>/lib/</outputDirectory>
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
-                <!-- Compendium -->
-                <include>org.apache.felix:org.osgi.compendium</include>
-                <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
-
-                <!-- PAX Logging -->
-                <include>org.ops4j.pax.logging:pax-logging-api</include>
-                <include>org.ops4j.pax.logging:pax-logging-service</include>
-
-                <!-- PAX config -->
-                <include>org.apache.felix:org.apache.felix.configadmin</include>
-                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.filemonitor</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant-${ant.version}</include>
-
-                <!-- Spring OSGi -->
-                <include>org.springframework:spring-aop</include>
-                <include>org.springframework:spring-beans</include>
-                <include>org.springframework:spring-context</include>
-                <include>org.springframework:spring-core</include>
-                <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-${aopalliance.version}</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib-${cglib.version}</include>
-                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.spring</include>
-
-		        <!-- GShell -->
-                <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</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.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
-
-		        <!-- OBR + GShell command -->
-                <include>org.apache.felix:org.apache.felix.bundlerepository</include>
-                <include>org.ops4j.pax.url:pax-url-mvn</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.obr</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
-
+                <include>org.apache.geronimo.specs:geronimo-activation_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>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.commands</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.management</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.deployer</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.commands</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.management</include>
             </includes>
         </dependencySet>
 

Copied: servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml (from r634214, servicemix/smx4/kernel/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?p2=servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml&p1=servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml&r1=634214&r2=634634&rev=634634&view=diff
==============================================================================
--- servicemix/smx4/kernel/trunk/assembly/src/main/descriptors/windows-bin.xml (original)
+++ servicemix/smx4/nmr/trunk/assembly/src/main/descriptors/windows-bin.xml Fri Mar  7 04:27:08 2008
@@ -96,44 +96,21 @@
             <unpack>false</unpack>
             <scope>runtime</scope>
             <includes>
-                <!-- Compendium -->
-                <include>org.apache.felix:org.osgi.compendium</include>
-                <include>org.apache.geronimo.specs:geronimo-servlet_2.5_spec</include>
-
-                <!-- PAX Logging -->
-                <include>org.ops4j.pax.logging:pax-logging-api</include>
-                <include>org.ops4j.pax.logging:pax-logging-service</include>
-
-                <!-- PAX config -->
-                <include>org.apache.felix:org.apache.felix.configadmin</include>
-                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.filemonitor</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.ant-${ant.version}</include>
-
-                <!-- Spring OSGi -->
-                <include>org.springframework:spring-aop</include>
-                <include>org.springframework:spring-beans</include>
-                <include>org.springframework:spring-context</include>
-                <include>org.springframework:spring-core</include>
-                <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-${aopalliance.version}</include>
-                <include>org.apache.servicemix.bundles:org.apache.servicemix.bundles.cglib-${cglib.version}</include>
-                <include>org.apache.servicemix.kernel:org.apache.servicemix.kernel.spring</include>
-
-		        <!-- GShell -->
-                <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</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.kernel.gshell:org.apache.servicemix.kernel.gshell.core</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.osgi</include>
-
-		        <!-- OBR + GShell command -->
-                <include>org.apache.felix:org.apache.felix.bundlerepository</include>
-                <include>org.ops4j.pax.url:pax-url-mvn</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.obr</include>
-                <include>org.apache.servicemix.kernel.gshell:org.apache.servicemix.kernel.gshell.features</include>
-
+                <include>org.apache.geronimo.specs:geronimo-activation_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>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.core</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.spring</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.osgi</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.commands</include>
+                <include>org.apache.servicemix.nmr:org.apache.servicemix.nmr.management</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.api</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.runtime</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.osgi</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.deployer</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.commands</include>
+                <include>org.apache.servicemix.jbi:org.apache.servicemix.jbi.management</include>
             </includes>
         </dependencySet>
 

Modified: servicemix/smx4/nmr/trunk/bundles/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/bundles/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/bundles/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/bundles/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.apache.servicemix.nmr</groupId>
         <artifactId>nmr-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.nmr.bundles</groupId>
     <artifactId>bundles</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-m1-SNAPSHOT</version>
     <name>ServiceMix OSGI Common Bundles</name>
 
     <modules>

Modified: servicemix/smx4/nmr/trunk/bundles/woodstox/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/bundles/woodstox/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/bundles/woodstox/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/bundles/woodstox/pom.xml Fri Mar  7 04:27:08 2008
@@ -24,13 +24,13 @@
     <parent>
         <groupId>org.apache.servicemix.nmr.bundles</groupId>
         <artifactId>bundles</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.bundles</groupId>
     <artifactId>${pom.groupId}.${pkgArtifactId}-${pkgVersion}</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-m1-SNAPSHOT</version>
     <name>ServiceMix OSGI Common Bundles: ${pkgArtifactId}-${pkgVersion}</name>
     <description>
         This bundle simply wraps ${pkgArtifactId}-${pkgVersion}.jar.
@@ -45,8 +45,8 @@
             *
         </servicemix.osgi.import.pkg>
         <servicemix.osgi.export>
-            com.ctc.wstx*;version=${pkgVersion},
-            org.codehaus.stax2*;version=${pkgVersion},
+            com.ctc.wstx*;version=${pkgVersion};-split-package:=merge-first,
+            org.codehaus.stax2*;version=${pkgVersion};-split-package:=merge-first,
         </servicemix.osgi.export>
     </properties>
 

Modified: servicemix/smx4/nmr/trunk/jbi/api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/api/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/api/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/api/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.apache.servicemix.jbi</groupId>
         <artifactId>jbi</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.jbi</groupId>
     <artifactId>org.apache.servicemix.jbi.api</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-m1-SNAPSHOT</version>
     <name>ServiceMix JBI API</name>
 
     <dependencies>

Modified: servicemix/smx4/nmr/trunk/jbi/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/commands/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/commands/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.jbi</groupId>
         <artifactId>jbi</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.jbi</groupId>

Modified: servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,20 +25,20 @@
     <parent>
         <groupId>org.apache.servicemix.jbi</groupId>
         <artifactId>jbi</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.jbi</groupId>
     <artifactId>org.apache.servicemix.jbi.deployer</artifactId>
     <packaging>bundle</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-m1-SNAPSHOT</version>
     <name>ServiceMix JBI Deployer</name>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.servicemix.jbi</groupId>
             <artifactId>org.apache.servicemix.jbi.api</artifactId>
-	        <version>1.0-SNAPSHOT</version>
+	        <version>1.0-m1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.apache.servicemix.kernel</groupId>

Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.jbi</groupId>
         <artifactId>jbi</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.jbi</groupId>
@@ -157,6 +157,10 @@
                 <exclusion>
                     <groupId>org.springframework</groupId>
                     <artifactId>spring</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>xfire</groupId>
+                    <artifactId>saaj-impl</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>

Modified: servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/log4j.properties?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/log4j.properties (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/src/test/resources/log4j.properties Fri Mar  7 04:27:08 2008
@@ -16,14 +16,19 @@
 #
 ################################################################################
 
-log4j.rootLogger=DEBUG, stdout
+log4j.rootLogger=DEBUG, out
+
+log4j.logger.org.springframework.osgi=DEBUG
+log4j.logger.org.apache.camel=DEBUG
+log4j.logger.org.apache.servicemix=DEBUG
 
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
 log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
 
-log4j.logger.org.springframework.osgi=DEBUG
-log4j.logger.org.apache.camel=DEBUG
-log4j.logger.org.apache.servicemix=DEBUG
+log4j.appender.out=org.apache.log4j.FileAppender
+log4j.appender.out.layout=org.apache.log4j.PatternLayout
+log4j.appender.out.layout.ConversionPattern=%d [%-15.15t] %-5p %-30.30c{1} - %m%n
+log4j.appender.out.file=target/servicemix-test.log
+log4j.appender.out.append=true
 
-#log4j.debug=false
\ No newline at end of file

Modified: servicemix/smx4/nmr/trunk/jbi/management/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/management/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/management/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/management/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.jbi</groupId>
         <artifactId>jbi</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.jbi</groupId>

Modified: servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/osgi/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.jbi</groupId>
         <artifactId>jbi</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.jbi</groupId>

Modified: servicemix/smx4/nmr/trunk/jbi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,13 +25,13 @@
     <parent>
         <groupId>org.apache.servicemix.nmr</groupId>
         <artifactId>nmr-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.jbi</groupId>
     <artifactId>jbi</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0-m1-SNAPSHOT</version>
     <name>ServiceMix JBI</name>
 
     <modules>

Modified: servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/runtime/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.jbi</groupId>
         <artifactId>jbi</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.jbi</groupId>

Modified: servicemix/smx4/nmr/trunk/nmr/api/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/api/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/api/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/api/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.nmr</groupId>
         <artifactId>nmr</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.nmr</groupId>

Modified: servicemix/smx4/nmr/trunk/nmr/commands/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.nmr</groupId>
         <artifactId>nmr</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.nmr</groupId>

Added: 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=634634&view=auto
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java (added)
+++ servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/ListCommand.java Fri Mar  7 04:27:08 2008
@@ -0,0 +1,40 @@
+/*
+ * 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.servicemix.nmr.commands;
+
+import org.apache.servicemix.nmr.api.Endpoint;
+import org.osgi.framework.ServiceReference;
+
+/**
+ * Displays the name of existing NMR endpoints
+ */
+public class ListCommand extends NmrCommandSupport {
+
+    protected Object doExecute() throws Exception {
+        io.out.println("Shared Libraries");
+        io.out.println("----------------");
+        ServiceReference[] references = getBundleContext().getAllServiceReferences(Endpoint.class.getName(), null);
+        if (references != null) {
+            for (ServiceReference ref : references) {
+                String name = (String) ref.getProperty(Endpoint.NAME);
+                io.out.println(name);
+            }
+        }
+        io.out.println();
+        return null;
+    }
+}

Modified: servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java (original)
+++ servicemix/smx4/nmr/trunk/nmr/commands/src/main/java/org/apache/servicemix/nmr/commands/NmrCommandSupport.java Fri Mar  7 04:27:08 2008
@@ -16,10 +16,18 @@
  */
 package org.apache.servicemix.nmr.commands;
 
+import java.util.List;
+
 import org.apache.geronimo.gshell.support.OsgiCommandSupport;
+import org.apache.servicemix.nmr.api.Endpoint;
 
 /**
  * Base class for NMR related commands
  */
 public abstract class NmrCommandSupport extends OsgiCommandSupport {
+
+    protected List<Endpoint> getEndpoints() throws Exception {
+        return getAllServices(Endpoint.class, null);
+    }
+
 }

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=634634&r1=634633&r2=634634&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 Fri Mar  7 04:27:08 2008
@@ -29,5 +29,14 @@
   http://www.springframework.org/schema/osgi
   http://www.springframework.org/schema/osgi/spring-osgi.xsd">
 
+    <bean id="list" class="org.apache.servicemix.nmr.commands.ListCommand" />
+
+    <osgi:service ref="list" interface="org.apache.geronimo.gshell.command.Command">
+      <osgi:service-properties>
+        <entry key="shell" value="nmr"/>
+        <entry key="alias" value="ls"/>
+      </osgi:service-properties>
+    </osgi:service>
+
 
 </beans>                                                                                                                                                                                                   

Modified: servicemix/smx4/nmr/trunk/nmr/core/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/core/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/core/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/core/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.nmr</groupId>
         <artifactId>nmr</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.nmr</groupId>

Modified: servicemix/smx4/nmr/trunk/nmr/management/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/management/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/management/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/management/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.nmr</groupId>
         <artifactId>nmr</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.nmr</groupId>

Modified: servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.nmr</groupId>
         <artifactId>nmr</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.nmr</groupId>

Modified: servicemix/smx4/nmr/trunk/nmr/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.nmr</groupId>
         <artifactId>nmr-parent</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.nmr</groupId>

Modified: servicemix/smx4/nmr/trunk/nmr/spring/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/spring/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/spring/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/spring/pom.xml Fri Mar  7 04:27:08 2008
@@ -25,7 +25,7 @@
     <parent>
         <groupId>org.apache.servicemix.nmr</groupId>
         <artifactId>nmr</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>1.0-m1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.apache.servicemix.nmr</groupId>

Modified: servicemix/smx4/nmr/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/pom.xml?rev=634634&r1=634633&r2=634634&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/pom.xml Fri Mar  7 04:27:08 2008
@@ -31,13 +31,14 @@
   <groupId>org.apache.servicemix.nmr</groupId>
   <artifactId>nmr-parent</artifactId>
   <packaging>pom</packaging>
-  <version>1.0-SNAPSHOT</version>
+  <version>1.0-m1-SNAPSHOT</version>
   <name>Apache ServiceMix NMR</name>
 
   <modules>
-    <module>bundles</module>
-    <module>nmr</module>
-    <module>jbi</module>
+      <module>bundles</module>
+      <module>nmr</module>
+      <module>jbi</module>
+      <module>assembly</module>
   </modules>
 
   <scm>
@@ -255,6 +256,28 @@
               </plugin>
           </plugins>
       </pluginManagement>
+      <plugins>
+          <plugin>
+              <artifactId>maven-remote-resources-plugin</artifactId>
+              <version>1.0-beta-2</version>
+              <executions>
+                  <execution>
+                      <goals>
+                          <goal>process</goal>
+                      </goals>
+                      <configuration>
+                          <resourceBundles>
+                              <resourceBundle>org.apache:apache-jar-resource-bundle:1.3</resourceBundle>
+                          </resourceBundles>
+                          <properties>
+                              <addLicense>true</addLicense>
+                              <projectName>Apache ServiceMix</projectName>
+                          </properties>
+                      </configuration>
+                  </execution>
+              </executions>
+          </plugin>
+      </plugins>
   </build>
 
   <reporting>
@@ -278,6 +301,12 @@
   </reporting>
 
   <profiles>
+      <profile>
+          <id>fastinstall</id>
+          <properties>
+              <maven.test.skip>true</maven.test.skip>
+          </properties>
+      </profile>
       <profile>
           <id>rat</id>
           <build>



Mime
View raw message