servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r594328 - in /incubator/servicemix/branches/servicemix-4.0/jbi: ./ deployer/ deployer/src/main/java/org/apache/servicemix/jbi/deployer/descriptor/ deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/ deployer/src/main/resources/M...
Date Mon, 12 Nov 2007 22:45:39 GMT
Author: gnodet
Date: Mon Nov 12 14:45:37 2007
New Revision: 594328

URL: http://svn.apache.org/viewvc?rev=594328&view=rev
Log:
Continue JBI 1.0 layer

Added:
    incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/resources/META-INF/
    incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/resources/META-INF/spring/
    incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/   (with props)
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/pom.xml
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/servicemix/
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/servicemix/jbi/
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/log4j.properties
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/org/
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/org/apache/
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/org/apache/servicemix/
    incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
    incubator/servicemix/branches/servicemix-4.0/jbi/offline/src/main/java/org/apache/servicemix/jbi/offline/Main.java
Modified:
    incubator/servicemix/branches/servicemix-4.0/jbi/deployer/pom.xml
    incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/descriptor/DescriptorFactory.java
    incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
    incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryImpl.java
    incubator/servicemix/branches/servicemix-4.0/jbi/offline/   (props changed)
    incubator/servicemix/branches/servicemix-4.0/jbi/offline/pom.xml
    incubator/servicemix/branches/servicemix-4.0/jbi/osgi/pom.xml
    incubator/servicemix/branches/servicemix-4.0/jbi/pom.xml
    incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/test/resources/log4j.properties

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/deployer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/deployer/pom.xml?rev=594328&r1=594327&r2=594328&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/deployer/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/deployer/pom.xml Mon Nov 12 14:45:37 2007
@@ -50,7 +50,6 @@
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.osgi.core</artifactId>
-            <version>${felix.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/descriptor/DescriptorFactory.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/descriptor/DescriptorFactory.java?rev=594328&r1=594327&r2=594328&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/descriptor/DescriptorFactory.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/descriptor/DescriptorFactory.java Mon Nov 12 14:45:37 2007
@@ -80,16 +80,46 @@
 
     /**
      * Build a jbi descriptor from the specified URL
-     * 
+     *
      * @param url
      *            url to the jbi descriptor
      * @return the Descriptor object
      */
     public static Descriptor buildDescriptor(final URL url) {
         try {
+            return buildDescriptor(url.openStream());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+
+    /**
+     * Build a jbi descriptor from the specified stream
+     *
+     * @param stream
+     *            input stream to the jbi descriptor
+     * @return the Descriptor object
+     */
+    public static Descriptor buildDescriptor(final InputStream stream) {
+        try {
             // Read descriptor
             ByteArrayOutputStream baos = new ByteArrayOutputStream();
-            copyInputStream(url.openStream(), baos);
+            copyInputStream(stream, baos);
+            return buildDescriptor(baos.toByteArray());
+        } catch (Exception e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Build a jbi descriptor from the specified binary data
+     * 
+     * @param bytes
+     * @return the Descriptor object
+     */
+    public static Descriptor buildDescriptor(final byte[] bytes) {
+        try {
             // Validate descriptor
             SchemaFactory schemaFactory = SchemaFactory.newInstance(XSD_SCHEMA_LANGUAGE);
             Schema schema = schemaFactory.newSchema(DescriptorFactory.class.getResource("jbi-descriptor.xsd"));
@@ -105,12 +135,12 @@
                     throw exception;
                 }
             });
-            validator.validate(new StreamSource(new ByteArrayInputStream(baos.toByteArray())));
+            validator.validate(new StreamSource(new ByteArrayInputStream(bytes)));
             // Parse descriptor
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             factory.setNamespaceAware(true);
             DocumentBuilder docBuilder = factory.newDocumentBuilder();
-            Document doc = docBuilder.parse(new ByteArrayInputStream(baos.toByteArray()));
+            Document doc = docBuilder.parse(new ByteArrayInputStream(bytes));
             Element jbi = doc.getDocumentElement();
             Descriptor desc = new Descriptor();
             desc.setVersion(Double.parseDouble(getAttribute(jbi, "version")));

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java?rev=594328&r1=594327&r2=594328&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/Deployer.java Mon Nov 12 14:45:37 2007
@@ -24,22 +24,29 @@
 
 import javax.jbi.component.Component;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.servicemix.jbi.deployer.SharedLibrary;
 import org.apache.servicemix.jbi.deployer.descriptor.Descriptor;
 import org.apache.servicemix.jbi.deployer.descriptor.DescriptorFactory;
 import org.apache.servicemix.jbi.deployer.descriptor.SharedLibraryList;
-import org.apache.xbean.classloader.JarFileClassLoader;
+import org.apache.xbean.classloader.MultiParentClassLoader;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.BundleEvent;
 import org.osgi.framework.BundleListener;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.osgi.context.BundleContextAware;
 import org.springframework.osgi.internal.context.support.BundleDelegatingClassLoader;
 
 /**
  * Deployer for JBI artifacts
  *
  */
-public class Deployer implements BundleListener {
+public class Deployer implements BundleListener, BundleContextAware, InitializingBean, DisposableBean {
+
+    private static final Log LOGGER = LogFactory.getLog(Deployer.class);
 
     private static final String JBI_DESCRIPTOR = "META-INF/jbi.xml";
 
@@ -58,13 +65,23 @@
         this.context = context;
     }
 
+    public void afterPropertiesSet() throws Exception {
+        this.context.addBundleListener(this);
+    }
+
+    public void destroy() throws Exception {
+        this.context.removeBundleListener(this);
+    }
+
     public void bundleChanged(BundleEvent event) {
         try {
             if (event.getType() == BundleEvent.INSTALLED) {
+                LOGGER.debug("Checking bundle: " + event.getBundle().getSymbolicName());
                 URL url = event.getBundle().getResource(JBI_DESCRIPTOR);
                 Descriptor descriptor = DescriptorFactory.buildDescriptor(url);
                 // TODO: check descriptor
                 if (descriptor.getComponent() != null) {
+                    LOGGER.debug("Bundle '" + event.getBundle().getSymbolicName() + "' is a JBI component");
                     // Create component class loader
                     ClassLoader classLoader = createComponentClassLoader(descriptor.getComponent(), event.getBundle());
                     // Instanciate component
@@ -75,10 +92,13 @@
                     props.put(NAME, descriptor.getComponent().getIdentification().getName());
                     props.put(TYPE, descriptor.getComponent().getType());
                     // register the component in the OSGi registry
+                    LOGGER.debug("Registering JBI component");
                     context.registerService(Component.class.getName(), component, props);
                 } else if (descriptor.getServiceAssembly() != null) {
+                    LOGGER.debug("Bundle '" + event.getBundle().getSymbolicName() + "' is a JBI service assembly");
                     // TODO:
                 } else if (descriptor.getSharedLibrary() != null) {
+                    LOGGER.debug("Bundle '" + event.getBundle().getSymbolicName() + "' is a JBI shared library");
                     SharedLibraryImpl sl = new SharedLibraryImpl(descriptor.getSharedLibrary(), event.getBundle());
                     sharedLibraries.put(sl.getName(), sl);
                     //context.registerService(SharedLibrary.class.getName(), sl, new Properties());
@@ -87,8 +107,7 @@
                 }
             }
         } catch (Exception e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
+            LOGGER.error("Error handling bundle event", e);
         }
     }
 
@@ -103,7 +122,7 @@
         } else {
             parents = new ClassLoader[1];
         }
-        parents[0] = BundleDelegatingClassLoader.createBundleClassLoaderFor(bundle, null);
+        parents[0] = BundleDelegatingClassLoader.createBundleClassLoaderFor(bundle, getClass().getClassLoader());
 
         // Create urls
         String[] classPathNames = component.getComponentClassPath().getPathElements();
@@ -116,7 +135,7 @@
         }
 
         // Create classloader
-        return new JarFileClassLoader(
+        return new MultiParentClassLoader(
                         component.getIdentification().getName(),
                         urls,
                         parents,

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryImpl.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryImpl.java?rev=594328&r1=594327&r2=594328&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryImpl.java (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/java/org/apache/servicemix/jbi/deployer/impl/SharedLibraryImpl.java Mon Nov 12 14:45:37 2007
@@ -7,6 +7,7 @@
 import org.apache.servicemix.jbi.deployer.SharedLibrary;
 import org.apache.servicemix.jbi.deployer.descriptor.ClassPath;
 import org.apache.xbean.classloader.JarFileClassLoader;
+import org.apache.xbean.classloader.MultiParentClassLoader;
 import org.osgi.framework.Bundle;
 import org.springframework.osgi.internal.context.support.BundleDelegatingClassLoader;
 
@@ -41,7 +42,7 @@
 
     public ClassLoader createClassLoader() {
         // Make the current ClassLoader the parent
-        ClassLoader parent = BundleDelegatingClassLoader.createBundleClassLoaderFor(bundle, null);
+        ClassLoader parent = BundleDelegatingClassLoader.createBundleClassLoaderFor(bundle, getClass().getClassLoader());
         boolean parentFirst = library.isParentFirstClassLoaderDelegation();
         ClassPath cp = library.getSharedLibraryClassPath();
         String[] classPathNames = cp.getPathElements();
@@ -52,7 +53,7 @@
                 throw new IllegalArgumentException("SharedLibrary classpath entry not found: '" +  classPathNames[i] + "'");
             }
         }
-        return new JarFileClassLoader(
+        return new MultiParentClassLoader(
                         library.getIdentification().getName(),
                         urls,
                         parent,

Added: incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml?rev=594328&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/deployer/src/main/resources/META-INF/spring/servicemix-jbi-deployer.xml Mon Nov 12 14:45:37 2007
@@ -0,0 +1,36 @@
+<?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:osgi="http://www.springframework.org/schema/osgi"
+       xmlns:util="http://www.springframework.org/schema/util"
+       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">
+
+    <!-- JBI Deployer -->
+    <bean id="deployer" class="org.apache.servicemix.jbi.deployer.impl.Deployer">
+    </bean>
+
+</beans>
\ No newline at end of file

Propchange: incubator/servicemix/branches/servicemix-4.0/jbi/itests/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Nov 12 14:45:37 2007
@@ -0,0 +1,4 @@
+target
+*.iml
+*.ipr
+*.iws

Added: incubator/servicemix/branches/servicemix-4.0/jbi/itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/itests/pom.xml?rev=594328&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/itests/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/itests/pom.xml Mon Nov 12 14:45:37 2007
@@ -0,0 +1,354 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <!--
+
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements.  See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to You under the Apache License, Version 2.0
+        (the "License"); you may not use this file except in compliance with
+        the License.  You may obtain a copy of the License at
+
+           http://www.apache.org/licenses/LICENSE-2.0
+
+        Unless required by applicable law or agreed to in writing, software
+        distributed under the License is distributed on an "AS IS" BASIS,
+        WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+        See the License for the specific language governing permissions and
+        limitations under the License.
+    -->
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.servicemix.jbi</groupId>
+        <artifactId>jbi</artifactId>
+        <version>4.0-SNAPSHOT</version>
+    </parent>
+
+    <groupId>org.apache.servicemix.jbi</groupId>
+    <artifactId>org.apache.servicemix.jbi.itests</artifactId>
+    <packaging>jar</packaging>
+    <version>4.0-SNAPSHOT</version>
+    <name>ServiceMix JBI Integration Tests</name>
+
+    <properties>
+        <osgi.test.platform>org.springframework.osgi.test.platform.EquinoxPlatform</osgi.test.platform>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.aopalliance</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jaxb-api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.jaxb-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.httpcore</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.nmr</groupId>
+            <artifactId>org.apache.servicemix.nmr.api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.nmr</groupId>
+            <artifactId>org.apache.servicemix.nmr.core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.nmr</groupId>
+            <artifactId>org.apache.servicemix.nmr.osgi</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.nmr</groupId>
+            <artifactId>org.apache.servicemix.nmr.spring</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.jbi</groupId>
+            <artifactId>org.apache.servicemix.jbi.api</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.jbi</groupId>
+            <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.jbi</groupId>
+            <artifactId>org.apache.servicemix.jbi.osgi</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.jbi</groupId>
+            <artifactId>org.apache.servicemix.jbi.deployer</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.jbi</groupId>
+            <artifactId>org.apache.servicemix.jbi.offline</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-beans</artifactId>
+            <version>${spring.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-context</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-aop</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-io</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-extender</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-annotation</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>junit.osgi</artifactId>
+            <version>3.8.2-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>asm.osgi</artifactId>
+            <version>2.2.3-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-spring</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-jms</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-osgi</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.camel</groupId>
+            <artifactId>camel-jhc</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-extender</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.osgi</groupId>
+            <artifactId>spring-osgi-annotation</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-tx</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-jms</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jms_1.1_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-stax-api_1.0_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-activation_1.1_spec</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <version>5.0-SNAPSHOT</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+            <version>3.2.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.felix</groupId>
+            <artifactId>org.osgi.compendium</artifactId>
+            <version>0.9.0-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.core</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>org.osgi.foundation</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.apache.felix</groupId>
+                    <artifactId>javax.servlet</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+            <version>0.9.7-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-service</artifactId>
+            <version>0.9.7-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-eip</artifactId>
+            <classifier>installer</classifier>
+            <type>zip</type>
+            <version>3.2.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix</groupId>
+            <artifactId>servicemix-shared</artifactId>
+            <classifier>installer</classifier>
+            <type>zip</type>
+            <version>3.2.1-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <!-- generate dependencies versions -->
+            <plugin>
+                <groupId>org.apache.servicemix.tooling</groupId>
+                <artifactId>depends-maven-plugin</artifactId>
+                <version>4.0-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <id>generate-depends-file</id>
+                        <goals>
+                            <goal>generate-depends-file</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <!-- run tests during the integration-test phase, not
+                 the normal test phase -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>default</id>
+                        <phase>test</phase>
+                        <goals></goals>
+                    </execution>
+                    <execution>
+                        <id>integration-test</id>
+                        <phase>integration-test</phase>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <configuration>
+                            <skip>false</skip>
+                            <forkMode>pertest</forkMode>
+                            <systemProperties>
+                                <property>
+                                    <name>org.springframework.osgi.test.framework</name>
+                                    <value>${osgi.test.platform}</value>
+                                </property>
+                            </systemProperties>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Added: incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java?rev=594328&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java (added)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/java/org/apache/servicemix/jbi/IntegrationTest.java Mon Nov 12 14:45:37 2007
@@ -0,0 +1,172 @@
+/*
+ * 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.jbi;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.apache.servicemix.jbi.offline.Main;
+import org.osgi.framework.Bundle;
+import org.springframework.osgi.test.AbstractConfigurableBundleCreatorTests;
+
+public class IntegrationTest extends AbstractConfigurableBundleCreatorTests {
+
+    private Properties dependencies;
+
+    /**
+	 * The manifest to use for the "virtual bundle" created
+	 * out of the test classes and resources in this project
+	 *
+	 * This is actually the boilerplate manifest with one additional
+	 * import-package added. We should provide a simpler customization
+	 * point for such use cases that doesn't require duplication
+	 * of the entire manifest...
+	 */
+	protected String getManifestLocation() {
+		return "classpath:org/apache/servicemix/MANIFEST.MF";
+	}
+
+	/**
+	 * The location of the packaged OSGi bundles to be installed
+	 * for this test. Values are Spring resource paths. The bundles
+	 * we want to use are part of the same multi-project maven
+	 * build as this project is. Hence we use the localMavenArtifact
+	 * helper method to find the bundles produced by the package
+	 * phase of the maven build (these tests will run after the
+	 * packaging phase, in the integration-test phase).
+	 *
+	 * JUnit, commons-logging, spring-core and the spring OSGi
+	 * test bundle are automatically included so do not need
+	 * to be specified here.
+	 */
+	protected String[] getTestBundlesNames() {
+        return new String[] {
+            getBundle("org.apache.geronimo.specs", "geronimo-jms_1.1_spec"),
+            getBundle("org.apache.geronimo.specs", "geronimo-servlet_2.5_spec"),
+            getBundle("org.apache.geronimo.specs", "geronimo-j2ee-management_1.1_spec"),
+            getBundle("org.apache.geronimo.specs", "geronimo-stax-api_1.0_spec"),
+            getBundle("org.apache.geronimo.specs", "geronimo-activation_1.1_spec"),
+            getBundle("org.apache.felix", "org.osgi.compendium"),
+            getBundle("org.ops4j.pax.logging", "pax-logging-api"),
+            getBundle("org.ops4j.pax.logging", "pax-logging-service"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.aopalliance"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-api"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-impl"),
+            getBundle("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.httpcore"),
+            getBundle("org.apache.activemq", "activemq-core"),
+            getBundle("org.springframework", "spring-beans"),
+            getBundle("org.springframework", "spring-core"),
+            getBundle("org.springframework", "spring-context"),
+            getBundle("org.springframework", "spring-aop"),
+            getBundle("org.springframework", "spring-test"),
+            getBundle("org.springframework", "spring-tx"),
+            getBundle("org.springframework", "spring-jms"),
+            getBundle("org.springframework.osgi", "spring-osgi-core"),
+            getBundle("org.springframework.osgi", "spring-osgi-io"),
+            getBundle("org.springframework.osgi", "spring-osgi-extender"),
+            getBundle("org.springframework.osgi", "spring-osgi-test"),
+            getBundle("org.springframework.osgi", "spring-osgi-annotation"),
+            getBundle("org.springframework.osgi", "junit.osgi"),
+            getBundle("org.springframework.osgi", "asm.osgi"),
+            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.api"),
+            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.core"),
+			getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.spring"),
+            getBundle("org.apache.servicemix.nmr", "org.apache.servicemix.nmr.osgi"),
+            getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.api"),
+            getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.runtime"),
+            getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.deployer"),
+            getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.offline"),
+            getBundle("org.apache.servicemix.jbi", "org.apache.servicemix.jbi.osgi"),
+		};
+	}
+
+    protected String getBundle(String groupId, String artifactId) {
+        return groupId + "," + artifactId + "," + getBundleVersion(groupId, artifactId);
+    }
+
+    protected String getBundleVersion(String groupId, String artifactId) {
+        if (dependencies == null) {
+            try {
+                Properties prop = new Properties();
+                prop.load(getClass().getResourceAsStream("/META-INF/maven/dependencies.properties"));
+                dependencies = prop;
+            } catch (IOException e) {
+                throw new IllegalStateException("Unable to load dependencies informations", e);
+            }
+        }
+        String version = dependencies.getProperty(groupId + "/" + artifactId + "/version");
+        if (version == null) {
+            throw new IllegalStateException("Unable to find dependency information for: " + groupId + " / " + artifactId);
+        }
+        return version;
+    }
+
+    protected String[] getTestFrameworkBundlesNames() {
+        return null;
+    }
+
+    /**
+	 * The superclass provides us access to the root bundle
+	 * context via the 'getBundleContext' operation
+	 */
+	public void testOSGiStartedOk() {
+		assertNotNull(bundleContext);
+	}
+
+    public void testJbiComponent() throws Exception {
+        // Test currently fails
+        installArtifact("org.apache.servicemix", "servicemix-shared-compat", "3.2.1-SNAPSHOT", "installer", "zip");
+        //installArtifact("org.apache.servicemix", "servicemix-shared-compat", "3.2.1-SNAPSHOT", "installer", "zip");
+        installArtifact("org.apache.servicemix", "servicemix-eip", "3.2.1-SNAPSHOT", "installer", "zip");
+
+        Thread.sleep(1000);
+    }
+
+    protected void installArtifact(String groupId, String artifactId, String version, String classifier, String type) throws Exception {
+        version = getBundleVersion(groupId, artifactId);
+        File in = localMavenBundle(groupId, artifactId, version, classifier, type);
+        File out = File.createTempFile("smx", ".jar");
+        new Main().run(in.toString(), out.toString());
+        Bundle bundle = bundleContext.installBundle(out.toURI().toString());
+        bundle.start();
+    }
+
+    protected File localMavenBundle(String groupId, String artifact, String version, String classifier, String type) {
+        String defaultHome = new File(new File(System.getProperty("user.home")), ".m2/repository").getAbsolutePath();
+        File repositoryHome = new File(System.getProperty("localRepository", defaultHome));
+
+        StringBuffer location = new StringBuffer(groupId.replace('.', '/'));
+        location.append('/');
+        location.append(artifact);
+        location.append('/');
+        location.append(version);
+        location.append('/');
+        location.append(artifact);
+        location.append('-');
+        location.append(version);
+        if (classifier != null) {
+            location.append('-');
+            location.append(classifier);
+        }
+        location.append(".");
+        location.append(type);
+
+        return new File(repositoryHome, location.toString());
+    }
+
+}
\ No newline at end of file

Added: incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/log4j.properties?rev=594328&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/log4j.properties (added)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/log4j.properties Mon Nov 12 14:45:37 2007
@@ -0,0 +1,29 @@
+#
+#    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.
+#
+################################################################################
+
+log4j.rootLogger=WARN, stdout
+
+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.debug=false
\ No newline at end of file

Added: incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF?rev=594328&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF (added)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/itests/src/test/resources/org/apache/servicemix/MANIFEST.MF Mon Nov 12 14:45:37 2007
@@ -0,0 +1,28 @@
+Manifest-Version: 1.0
+License-00: 
+License-01: Licensed to the Apache Software Foundation (ASF) under one or more
+License-02: contributor license agreements.  See the NOTICE file distributed with
+License-03: this work for additional information regarding copyright ownership.
+License-04: The ASF licenses this file to You under the Apache License, Version 2.0
+License-05: (the "License"); you may not use this file except in compliance with
+License-06: the License.  You may obtain a copy of the License at
+License-07: 
+License-08:      http://www.apache.org/licenses/LICENSE-2.0
+License-09: 
+License-10: Unless required by applicable law or agreed to in writing, software
+License-11: distributed under the License is distributed on an "AS IS" BASIS,
+License-12: WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+License-13: See the License for the specific language governing permissions and
+License-14: limitations under the License.
+License-15: 
+Bundle-Name: org.apache.servicemix.test
+Bundle-SymbolicName: org.apache.servicemix.test
+Bundle-Vendor: Spring Framework
+Bundle-Activator: org.springframework.osgi.test.JUnitTestActivator
+Import-Package: junit.framework,
+ org.osgi.framework;specification-version="1.3.0",
+ org.springframework.core.io,
+ org.springframework.osgi.test,
+ org.apache.servicemix.nmr.api,
+ org.apache.servicemix.nmr.core,
+ org.apache.servicemix.jbi.offline

Propchange: incubator/servicemix/branches/servicemix-4.0/jbi/offline/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Nov 12 14:45:37 2007
@@ -2,3 +2,6 @@
 .project
 .settings
 target
+*.iml
+*.ipr
+*.iws

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/offline/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/offline/pom.xml?rev=594328&r1=594327&r2=594328&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/offline/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/offline/pom.xml Mon Nov 12 14:45:37 2007
@@ -48,6 +48,18 @@
       <scope>test</scope>
     </dependency-->
     <dependency>
+        <groupId>org.apache.servicemix.jbi</groupId>
+        <artifactId>org.apache.servicemix.jbi.deployer</artifactId>
+        <version>4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix</groupId>
+        <artifactId>servicemix-eip</artifactId>
+        <classifier>installer</classifier>
+        <type>zip</type>
+        <version>3.1.2</version>
+    </dependency>
+    <dependency>
       <groupId>org.springframework</groupId>
       <artifactId>spring-core</artifactId>
       <version>${spring.version}</version>
@@ -78,7 +90,7 @@
           <instructions>
             <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
             <Export-Package>${pom.artifactId}*</Export-Package>
-            <DynamicImport-Package>*</DynamicImport-Package>
+            <Import-Package>org.springframework*;resolution:=optional,*</Import-Package>
             <Spring-Context>*;publish-context:=false</Spring-Context>
           </instructions>
         </configuration>

Added: incubator/servicemix/branches/servicemix-4.0/jbi/offline/src/main/java/org/apache/servicemix/jbi/offline/Main.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/offline/src/main/java/org/apache/servicemix/jbi/offline/Main.java?rev=594328&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/offline/src/main/java/org/apache/servicemix/jbi/offline/Main.java (added)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/offline/src/main/java/org/apache/servicemix/jbi/offline/Main.java Mon Nov 12 14:45:37 2007
@@ -0,0 +1,82 @@
+/**
+ * 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.jbi.offline;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Map;
+import java.util.jar.Attributes;
+import java.util.jar.JarEntry;
+import java.util.jar.JarFile;
+import java.util.jar.JarInputStream;
+import java.util.jar.JarOutputStream;
+import java.util.jar.Manifest;
+
+import org.apache.servicemix.jbi.deployer.descriptor.Descriptor;
+import org.apache.servicemix.jbi.deployer.descriptor.DescriptorFactory;
+
+public class Main {
+
+    public static void main(String[] args) throws Exception {
+        new Main().run(args);
+    }
+
+    public void run(String... args) throws Exception {
+        File f = new File(args[0]);
+        if (!f.exists()) {
+            throw new IllegalStateException("File " + f.toString() + " does not exists.");
+        }
+        JarFile jar = new JarFile(args[0]);
+        Manifest m = jar.getManifest();
+        JarEntry entry = jar.getJarEntry("META-INF/jbi.xml");
+        InputStream is = jar.getInputStream(entry);
+        Descriptor desc = DescriptorFactory.buildDescriptor(is);
+
+        if (desc.getComponent() != null) {
+            String name = desc.getComponent().getIdentification().getName();
+            String version = m.getMainAttributes().getValue("Implementation-Version");
+            m.getMainAttributes().put(new Attributes.Name("Bundle-SymbolicName"), name);
+            m.getMainAttributes().put(new Attributes.Name("Bundle-Version"), version);
+        }
+
+        JarInputStream jis = new JarInputStream(new FileInputStream(args[0]));
+        JarOutputStream jos = new JarOutputStream(new FileOutputStream(args[1]), m);
+
+        byte[] buffer = new byte[8192];
+        entry = jis.getNextJarEntry();
+        while (entry != null) {
+            jos.putNextEntry(entry);
+            copyInputStream(jis, jos);
+            jos.closeEntry();
+            entry = jis.getNextJarEntry();
+        }
+        jos.close();
+        jis.close();
+    }
+
+    protected static void copyInputStream(InputStream in, OutputStream out) throws IOException {
+        byte[] buffer = new byte[4096];
+        int len;
+        while ((len = in.read(buffer)) >= 0) {
+            out.write(buffer, 0, len);
+        }
+    }
+}

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/osgi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/osgi/pom.xml?rev=594328&r1=594327&r2=594328&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/osgi/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/osgi/pom.xml Mon Nov 12 14:45:37 2007
@@ -38,7 +38,10 @@
         <dependency>
             <groupId>org.apache.servicemix.jbi</groupId>
             <artifactId>org.apache.servicemix.jbi.runtime</artifactId>
-            <version>4.0-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.servicemix.jbi</groupId>
+            <artifactId>org.apache.servicemix.jbi.deployer</artifactId>
         </dependency>
     </dependencies>
 

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/pom.xml?rev=594328&r1=594327&r2=594328&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/pom.xml Mon Nov 12 14:45:37 2007
@@ -39,6 +39,8 @@
         <module>runtime</module>
         <module>deployer</module>
         <module>osgi</module>
+        <module>offline</module>
+        <module>itests</module>
     </modules>
 
 </project>

Modified: incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/test/resources/log4j.properties?rev=594328&r1=594327&r2=594328&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/test/resources/log4j.properties (original)
+++ incubator/servicemix/branches/servicemix-4.0/jbi/runtime/src/test/resources/log4j.properties Mon Nov 12 14:45:37 2007
@@ -21,7 +21,7 @@
 #
 # The logging properties used during tests..
 #
-log4j.rootLogger=DEBUG, stdout
+log4j.rootLogger=DEBUG, out
 
 log4j.logger.org.springframework=INFO
 log4j.logger.org.apache.activemq=INFO



Mime
View raw message