servicemix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gno...@apache.org
Subject svn commit: r577761 [2/2] - in /incubator/servicemix/branches/servicemix-4.0: ./ apache-servicemix/ apache-servicemix/src/main/installers/ api/ api/src/main/java/org/apache/servicemix/api/ bundles/ bundles/activation/ bundles/httpcore/ bundles/j2ee-man...
Date Thu, 20 Sep 2007 14:19:58 GMT
Added: incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/examples/intermediary/pom.xml Thu Sep 20
07:19:51 2007
@@ -0,0 +1,81 @@
+<?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</groupId>
+    <artifactId>examples</artifactId>
+    <version>4.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.servicemix.examples</groupId>
+  <artifactId>org.apache.servicemix.examples.intermediary</artifactId>
+  <packaging>bundle</packaging>
+  <version>4.0-SNAPSHOT</version>
+  <name>ServiceMix Intermediary Example</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>org.apache.servicemix.api</artifactId>
+      <version>4.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-core</artifactId>
+      <version>${camel.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-spring</artifactId>
+      <version>${camel.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-http</artifactId>
+      <version>${camel.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-jms</artifactId>
+      <version>${camel.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <configuration>
+          <instructions>
+            <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
+            <Export-Package>${pom.artifactId}</Export-Package>
+            <Import-Package>org.apache.camel</Import-Package>
+            <DynamicImport-Package>*</DynamicImport-Package>
+          </instructions>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

Added: incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/java/org/apache/servicemix/examples/intermediary/IntermediaryRoutes.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/java/org/apache/servicemix/examples/intermediary/IntermediaryRoutes.java?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/java/org/apache/servicemix/examples/intermediary/IntermediaryRoutes.java
(added)
+++ incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/java/org/apache/servicemix/examples/intermediary/IntermediaryRoutes.java
Thu Sep 20 07:19:51 2007
@@ -0,0 +1,93 @@
+package org.apache.servicemix.examples.intermediary;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Predicate;
+import org.apache.camel.model.language.ExpressionType;
+import org.apache.camel.spring.SpringRouteBuilder;
+
+/**
+ * Reusable route
+ */
+public class IntermediaryRoutes extends SpringRouteBuilder {
+
+    private String name;
+    private String ack;
+    private String nack;
+
+    public void configure() throws Exception {
+        // Endpoint ids
+        String request             = "ref:" + name + ".request";
+        String requestProvider     = "ref:" + name + ".requestProvider";
+        String responseConsumer    = "ref:" + name + ".responseConsumer";
+        String response            = "ref:" + name + ".response";
+        String dbStorer            = "ref:" + name + ".dbStorer";
+        String dbLoader            = "ref:" + name + ".dbLoader";
+        String requestTransformer  = "ref:" + name + ".requestTransformer";
+        String responseTransformer = "ref:" + name + ".responseTransformer";
+        String nackTransformer     = "ref:" + name + ".nackTransformer";
+        // Built-in endpoints
+        String requestStorage      = "activemq:queue:" + name + ".requests?transacted=true";
+        String responseStorage     = "activemq:queue:" + name + ".responses?transacted=true";
+        // Bean references
+        Predicate isNack           = bean(Predicate.class, name + ".isNackExpression");
+
+        from(request).
+            group(name + ": Route 1").
+            tryBlock().
+                to(requestStorage).
+                setOutBody(constant(ack)).
+            handle(Throwable.class).
+                setFaultBody(constant(nack));
+
+        from(requestStorage).
+            group(name + ": Route 2").
+            to(requestTransformer).
+            to(requestProvider).
+            filter(isNack).
+            to(nackTransformer).
+            to(dbStorer);
+
+        from(responseConsumer).
+            group(name + ": Route 3").
+            tryBlock().
+                to(responseStorage).
+                setOutBody(constant(ack)).
+            handle(Throwable.class).
+                setFaultBody(constant(nack));
+
+        from(responseStorage).
+            group(name + ": Route 4").
+            to(responseTransformer).
+            to(dbStorer);
+
+        from(response).
+            group(name + ": Route 5").
+            to(dbLoader);
+    }
+
+    public String getAck() {
+        return ack;
+    }
+
+    public void setAck(String ack) {
+        this.ack = ack;
+    }
+
+    public String getNack() {
+        return nack;
+    }
+
+    public void setNack(String nack) {
+        this.nack = nack;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+
+}

Added: incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/spring/intermediary.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/spring/intermediary.xml?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/spring/intermediary.xml
(added)
+++ incubator/servicemix/branches/servicemix-4.0/examples/intermediary/src/main/resources/META-INF/spring/intermediary.xml
Thu Sep 20 07:19:51 2007
@@ -0,0 +1,91 @@
+<?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"
+       xmlns:camel="http://activemq.apache.org/camel/schema/spring"
+       xmlns:camel-osgi="http://activemq.apache.org/camel/schema/osgi"
+       xsi:schemaLocation="
+  http://www.springframework.org/schema/beans
+  http://www.springframework.org/schema/beans/spring-beans.xsd
+  http://www.springframework.org/schema/util
+  http://www.springframework.org/schema/util/spring-util.xsd
+  http://www.springframework.org/schema/osgi
+  http://www.springframework.org/schema/osgi/spring-osgi-1.0-m3.xsd
+  http://activemq.apache.org/camel/schema/spring
+  http://activemq.apache.org/camel/schema/spring/camel-spring.xsd
+  http://activemq.apache.org/camel/schema/osgi
+  http://activemq.apache.org/camel/schema/osgi/camel-osgi.xsd">
+
+    <!-- ServiceMix NMR -->
+    <camel-osgi:camelContext id="camel">
+
+        <!-- Endpoint definitions used by the route builder -->
+        <camel:endpoint id="Intermediary.request" uri="jhc:http://localhost:8080/requests"
/>
+        <camel:endpoint id="Intermediary.requestProvider" uri="jhc:http://localhost:9090/requests"
/>
+        <camel:endpoint id="Intermediary.responseConsumer" uri="jhc:http://localhost:8081/responses"
/>
+        <camel:endpoint id="Intermediary.response" uri="jhc:http://localhost:8082/responses"
/>
+        <camel:endpoint id="Intermediary.dbStorer" uri="seda:store" />
+        <camel:endpoint id="Intermediary.dbLoader" uri="seda:store" />
+        <camel:endpoint id="Intermediary.requestTransformer" uri="seda:store" />
+        <camel:endpoint id="Intermediary.nackTransformer" uri="seda:store" />
+        <camel:endpoint id="Intermediary.responseTransformer" uri="seda:store" />
+
+    </camel-osgi:camelContext>
+
+    <bean id="activemq" class="org.apache.activemq.camel.component.ActiveMQComponent">
+        <property name="connectionFactory" ref="connectionFactory" />
+        <property name="transactionManager" ref="jmsTransactionManager" />
+    </bean>
+
+    <bean id="jmsTransactionManager" class="org.springframework.jms.connection.JmsTransactionManager">
+        <constructor-arg ref="connectionFactory" />
+    </bean>
+
+    <bean id="connectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+        <constructor-arg value="vm://localhost?persistent=false" />
+    </bean>
+
+    <bean id="routeBuilder" class="org.apache.servicemix.examples.intermediary.IntermediaryRoutes">
+        <property name="name" value="Intermediary" />
+        <property name="ack">
+            <value><![CDATA[
+               <ack />
+            ]]></value>
+        </property>
+        <property name="nack">
+            <value><![CDATA[
+               <nack />
+            ]]></value>
+        </property>
+    </bean>
+
+    <camel:xpath id="Intermediary.isNackExpression">
+        //*:nack
+    </camel:xpath>
+
+    <bean id="smx" class="org.apache.servicemix.camel.ServiceMixComponent">
+        <property name="nmr" ref="nmr" />
+    </bean>
+
+    <osgi:reference id="nmr" interface="org.apache.servicemix.api.NMR" mandatory="true"
/>    
+
+</beans>
\ No newline at end of file

Added: incubator/servicemix/branches/servicemix-4.0/examples/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/examples/pom.xml?rev=577761&view=auto
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/examples/pom.xml (added)
+++ incubator/servicemix/branches/servicemix-4.0/examples/pom.xml Thu Sep 20 07:19:51 2007
@@ -0,0 +1,43 @@
+<?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</groupId>
+    <artifactId>servicemix</artifactId>
+    <version>4.0-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.servicemix</groupId>
+  <artifactId>examples</artifactId>
+  <packaging>pom</packaging>
+  <version>4.0-SNAPSHOT</version>
+  <name>ServiceMix Examples</name>
+
+  <modules>
+	<module>intermediary</module>
+  </modules>
+
+  <properties>
+  </properties>
+
+</project>

Modified: incubator/servicemix/branches/servicemix-4.0/itests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/pom.xml?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/itests/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/itests/pom.xml Thu Sep 20 07:19:51 2007
@@ -33,6 +33,10 @@
   <version>4.0-SNAPSHOT</version>
   <name>Integration Tests</name>
 
+  <properties>
+	<osgi.test.platform>org.springframework.osgi.test.platform.EquinoxPlatform</osgi.test.platform>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
@@ -41,6 +45,18 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-spring</artifactId>
+      <version>${camel.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.camel</groupId>
+      <artifactId>camel-osgi</artifactId>
+      <version>${camel.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.springframework.osgi</groupId>
       <artifactId>spring-osgi-test</artifactId>
       <version>${spring.osgi.version}</version>
@@ -83,6 +99,18 @@
 	  <scope>test</scope>
 	</dependency>
     <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-tx</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-jms</artifactId>
+      <version>${spring.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
 	  <groupId>org.slf4j</groupId>
 	  <artifactId>slf4j-api</artifactId>
       <version>1.4.3</version>
@@ -100,24 +128,28 @@
       <version>1.4.3</version>
 	  <scope>test</scope>
 	</dependency>
+    <!--
+    <dependency>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.main</artifactId>
+      <version>${felix.version}</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>knopflerfish</groupId>
       <artifactId>framework</artifactId>
       <version>2.0.1</version>
       <scope>test</scope>
     </dependency>
-    <dependency>
-	  <groupId>org.apache.felix</groupId>
-	  <artifactId>org.apache.felix.main</artifactId>
-	  <version>${felix.version}</version>
-      <scope>test</scope>
-	</dependency>
+	-->
   </dependencies>
 
   <build>
@@ -146,12 +178,10 @@
               <skip>false</skip>
               <forkMode>pertest</forkMode>
               <systemProperties>
-	            <!--
                 <property>
                   <name>org.springframework.osgi.test.framework</name>
-                  <value>org.springframework.osgi.test.platform.FelixPlatform</value>
+                  <value>${osgi.test.platform}</value>
                 </property>
-                -->
               </systemProperties>
             </configuration>
           </execution>

Modified: incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
(original)
+++ incubator/servicemix/branches/servicemix-4.0/itests/src/test/java/org/apache/servicemix/IntegrationTest.java
Thu Sep 20 07:19:51 2007
@@ -21,8 +21,7 @@
 import org.osgi.framework.ServiceReference;
 import org.springframework.osgi.test.AbstractConfigurableBundleCreatorTests;
 
-import java.io.IOException;
-import java.util.jar.Manifest;
+import java.net.URL;
 
 public class IntegrationTest extends AbstractConfigurableBundleCreatorTests {
 
@@ -54,11 +53,27 @@
 	 */
 	protected String[] getBundles() {
 		return new String[] {
+            localMavenArtifact("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jms",
"1.1-4.0-SNAPSHOT"),
+            localMavenArtifact("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.j2ee-management",
"1.0-4.0-SNAPSHOT"),
+            localMavenArtifact("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.stax-api",
"1.0.1-4.0-SNAPSHOT"),
+            localMavenArtifact("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.activation",
"1.1-4.0-SNAPSHOT"),
+            localMavenArtifact("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-api",
"2.0-4.0-SNAPSHOT"),
+            localMavenArtifact("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.jaxb-impl",
"2.0.3-4.0-SNAPSHOT"),
+            localMavenArtifact("org.apache.servicemix.bundles", "org.apache.servicemix.bundles.httpcore",
"4.0-alpha5-4.0-SNAPSHOT"),
+            localMavenArtifact("org.apache.activemq", "activemq-core", "5.0-SNAPSHOT"),
+            localMavenArtifact("org.springframework", "spring-tx", "2.1-m4"),
+            localMavenArtifact("org.springframework", "spring-jms", "2.1-m4"),
+            localMavenArtifact("org.apache.camel", "camel-core", "1.1-SNAPSHOT"),
+            localMavenArtifact("org.apache.camel", "camel-spring", "1.1-SNAPSHOT"),
+            localMavenArtifact("org.apache.camel", "camel-osgi", "1.1-SNAPSHOT"),
+            localMavenArtifact("org.apache.camel", "camel-jms", "1.1-SNAPSHOT"),
+            localMavenArtifact("org.apache.camel", "camel-jhc", "1.1-SNAPSHOT"),
             localMavenArtifact("org.apache.servicemix", "org.apache.servicemix.api", "4.0-SNAPSHOT"),
             localMavenArtifact("org.apache.servicemix", "org.apache.servicemix.core", "4.0-SNAPSHOT"),
 			localMavenArtifact("org.apache.servicemix", "org.apache.servicemix.spring", "4.0-SNAPSHOT"),
             localMavenArtifact("org.apache.servicemix", "org.apache.servicemix.nmr", "4.0-SNAPSHOT"),
-            localMavenArtifact("org.springframework.osgi", "backport-util-concurrent", "3.0-SNAPSHOT"),
+            localMavenArtifact("org.apache.servicemix", "org.apache.servicemix.camel", "4.0-SNAPSHOT"),
+            localMavenArtifact("org.apache.servicemix.examples", "org.apache.servicemix.examples.intermediary",
"4.0-SNAPSHOT"),
 		};
 	}
 	
@@ -82,7 +97,7 @@
 	 */
 	public void testSimpleServiceExported() {
 		waitOnContextCreation("org.apache.servicemix.nmr");
-		//waitOnContextCreation("org.apache.servicemix.test");
+		waitOnContextCreation("org.apache.servicemix.examples.intermediary");
 		BundleContext context = getBundleContext();
         ServiceReference ref = context.getServiceReference(NMR.class.getName());
         assertNotNull("Service Reference is null", ref);

Modified: incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/log4j.properties?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/log4j.properties
(original)
+++ incubator/servicemix/branches/servicemix-4.0/itests/src/test/resources/log4j.properties
Thu Sep 20 07:19:51 2007
@@ -23,5 +23,7 @@
 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

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/pom.xml Thu Sep 20 07:19:51 2007
@@ -36,6 +36,16 @@
   <dependencies>
     <dependency>
       <groupId>org.apache.servicemix</groupId>
+      <artifactId>org.apache.servicemix.api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
+      <artifactId>org.apache.servicemix.core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.servicemix</groupId>
       <artifactId>org.apache.servicemix.spring</artifactId>
       <version>${project.version}</version>
     </dependency>
@@ -48,6 +58,7 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
       <version>${felix.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>

Modified: incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
(original)
+++ incubator/servicemix/branches/servicemix-4.0/nmr/src/main/resources/META-INF/spring/servicemix-nmr.xml
Thu Sep 20 07:19:51 2007
@@ -27,7 +27,7 @@
   http://www.springframework.org/schema/util
   http://www.springframework.org/schema/util/spring-util.xsd
   http://www.springframework.org/schema/osgi
-  http://www.springframework.org/schema/osgi/spring-osgi.xsd">
+  http://www.springframework.org/schema/osgi/spring-osgi-1.0-m3.xsd">
 
     <!-- ServiceMix NMR -->
     <bean id="servicemix" class="org.apache.servicemix.core.ServiceMix">

Modified: incubator/servicemix/branches/servicemix-4.0/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/pom.xml?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/pom.xml Thu Sep 20 07:19:51 2007
@@ -32,9 +32,11 @@
 	<module>core</module>
 	<module>spring</module>
 	<module>nmr</module>
+	<module>camel</module>
+	<module>bundles</module>
+	<module>examples</module>
 	<module>itests</module>
 	<module>daemon</module>
-	<module>bundles</module>
 	<module>apache-servicemix</module>
   </modules>
 
@@ -58,6 +60,7 @@
   <properties>
 	<junit.version>4.4</junit.version>
 	<felix.version>1.0.0</felix.version>
+	<camel.version>1.1-SNAPSHOT</camel.version>
 	<spring.osgi.version>1.0-m3-SNAPSHOT</spring.osgi.version>
 	<spring.version>2.1-m4</spring.version>
 	<commons.logging.version>1.1</commons.logging.version>

Modified: incubator/servicemix/branches/servicemix-4.0/spring/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-4.0/spring/pom.xml?rev=577761&r1=577760&r2=577761&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-4.0/spring/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-4.0/spring/pom.xml Thu Sep 20 07:19:51 2007
@@ -48,6 +48,7 @@
       <groupId>org.apache.felix</groupId>
       <artifactId>org.osgi.core</artifactId>
       <version>${felix.version}</version>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>junit</groupId>



Mime
View raw message