servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r609798 - in /servicemix/smx4/nmr/trunk: jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java jbi/itests/pom.xml nmr/osgi/pom.xml
Date Mon, 07 Jan 2008 22:37:26 GMT
Author: gnodet
Date: Mon Jan  7 14:37:25 2008
New Revision: 609798

URL: http://svn.apache.org/viewvc?rev=609798&view=rev
Log:
Fix integration tests

Modified:
    servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
    servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
    servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml

Modified: servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java?rev=609798&r1=609797&r2=609798&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
(original)
+++ servicemix/smx4/nmr/trunk/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
Mon Jan  7 14:37:25 2008
@@ -106,8 +106,10 @@
                 installComponent(descriptor.getComponent(), bundle);
             } else if (descriptor.getServiceAssembly() != null) {
                 deployServiceAssembly(descriptor.getServiceAssembly(), bundle);
-            } else {
+            } else if (descriptor.getSharedLibrary() != null) {
                 installSharedLibrary(descriptor.getSharedLibrary(), bundle);
+            } else {
+                throw new IllegalStateException("Unrecognized JBI descriptor: " + url);
             }
         } catch (PendingException e) {
             pendingBundles.add(e.getBundle());

Modified: servicemix/smx4/nmr/trunk/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/jbi/itests/pom.xml?rev=609798&r1=609797&r2=609798&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/jbi/itests/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/jbi/itests/pom.xml Mon Jan  7 14:37:25 2008
@@ -172,6 +172,16 @@
             <artifactId>wsdl-first-sa</artifactId>
             <version>${smx3.version}</version>
             <type>zip</type>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
+                    <artifactId>wsdl-first-jsr181-su</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.servicemix.samples.wsdl-first</groupId>
+                    <artifactId>wsdl-first-http-su</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
     </dependencies>
 

Modified: servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml?rev=609798&r1=609797&r2=609798&view=diff
==============================================================================
--- servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml (original)
+++ servicemix/smx4/nmr/trunk/nmr/osgi/pom.xml Mon Jan  7 14:37:25 2008
@@ -82,7 +82,7 @@
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
-                        <Import-Package>org.apache.servicemix.nmr.core</Import-Package>
+                        <Import-Package>org.apache.servicemix.nmr.api,org.apache.servicemix.nmr.core</Import-Package>
                         <Spring-Context>*;publish-context:=false;create-asynchronously:=false</Spring-Context>
                     </instructions>
                 </configuration>



Mime
View raw message