You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/11/29 02:54:12 UTC
svn commit: r480328 [2/2] - in /incubator/servicemix/trunk: ./
common/servicemix-common/src/main/java/org/apache/servicemix/common/xbean/
common/servicemix-common/src/test/java/org/apache/servicemix/common/
common/servicemix-components/ core/servicemix...
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb?view=diff&rev=480328&r1=480327&r2=480328
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-script/src/test/resources/RubyExchangeProcessor.rb Tue Nov 28 17:54:10 2006
@@ -1,6 +1,9 @@
require 'java'
+include_class 'javax.jbi.messaging.MessageExchange'
+include_class 'org.apache.servicemix.jbi.jaxp.StringSource'
include_class 'org.apache.servicemix.common.ExchangeProcessor'
+include_class 'org.apache.servicemix.script.ScriptExchangeHelper'
class RubyExchangeProcessor < ExchangeProcessor
@@ -9,7 +12,7 @@
end
def start()
- print "Starting"
+ print "Starting\n"
end
def process(exchange)
@@ -17,11 +20,15 @@
print exchange
print " using "
print @exchangeHelper
+ print "\n"
+ out = exchange.createMessage()
+ out.setContent(StringSource.new("<world>hello</world>"))
+ exchange.setMessage(out, "out")
@exchangeHelper.sendExchange(exchange)
end
def stop()
- print "Stopping"
+ print "Stopping\n"
end
def toString()
Modified: incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/pom.xml?view=diff&rev=480328&r1=480327&r2=480328
==============================================================================
--- incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/serviceengines/servicemix-wsn2005/pom.xml Tue Nov 28 17:54:10 2006
@@ -47,6 +47,49 @@
</dependency>
<dependency>
<groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-services</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-jbi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jmx</artifactId>
+ <version>${spring-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-components</artifactId>
<scope>test</scope>
</dependency>
@@ -71,11 +114,6 @@
<dependency>
<groupId>xfire</groupId>
<artifactId>xfire-jsr181-api</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <scope>provided</scope>
</dependency>
</dependencies>
Modified: incubator/servicemix/trunk/deployables/sharedlibraries/servicemix-shared/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/deployables/sharedlibraries/servicemix-shared/pom.xml?view=diff&rev=480328&r1=480327&r2=480328
==============================================================================
--- incubator/servicemix/trunk/deployables/sharedlibraries/servicemix-shared/pom.xml (original)
+++ incubator/servicemix/trunk/deployables/sharedlibraries/servicemix-shared/pom.xml Tue Nov 28 17:54:10 2006
@@ -43,6 +43,10 @@
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-soap</artifactId>
</dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
</dependencies>
<build>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix-web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix-web/pom.xml?view=diff&rev=480328&r1=480327&r2=480328
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix-web/pom.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix-web/pom.xml Tue Nov 28 17:54:10 2006
@@ -107,6 +107,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
</dependencies>
<build>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml?view=diff&rev=480328&r1=480327&r2=480328
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/pom.xml Tue Nov 28 17:54:10 2006
@@ -145,7 +145,18 @@
</dependency>
<dependency>
<groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
+ <artifactId>spring-core</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-context</artifactId>
+ <version>${spring-version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
Modified: incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml?view=diff&rev=480328&r1=480327&r2=480328
==============================================================================
--- incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml (original)
+++ incubator/servicemix/trunk/distributions/apache-servicemix/src/main/assembly/bin.xml Tue Nov 28 17:54:10 2006
@@ -117,7 +117,11 @@
<include>org.apache.xbean:xbean-server</include>
<include>org.apache.xbean:xbean-kernel</include>
<include>wsdl4j:wsdl4j</include>
- <include>org.springframework:spring</include>
+ <include>org.springframework:spring-core</include>
+ <include>org.springframework:spring-beans</include>
+ <include>org.springframework:spring-context</include>
+ <include>org.springframework:spring-jmx</include>
+ <include>org.springframework:spring-dao</include>
<include>org.apache.geronimo.specs:geronimo-jms_1.1_spec</include>
<include>org.apache.geronimo.specs:geronimo-jta_1.0.1B_spec</include>
Modified: incubator/servicemix/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/pom.xml?view=diff&rev=480328&r1=480327&r2=480328
==============================================================================
--- incubator/servicemix/trunk/pom.xml (original)
+++ incubator/servicemix/trunk/pom.xml Tue Nov 28 17:54:10 2006
@@ -199,7 +199,7 @@
<xfire-version>1.2.2</xfire-version>
<mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
<xbean-version>2.7</xbean-version>
- <spring-version>2.0</spring-version>
+ <spring-version>2.0.1</spring-version>
<activemq-version>4.1-incubator-SNAPSHOT</activemq-version>
<activeio-version>3.0-SNAPSHOT</activeio-version>
<backport-util-concurrent-version>2.2</backport-util-concurrent-version>
@@ -596,6 +596,12 @@
<groupId>org.apache.activemq</groupId>
<artifactId>activemq-core</artifactId>
<version>${activemq-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.activemq</groupId>
@@ -610,12 +616,12 @@
<dependency>
<groupId>jivesoftware</groupId>
<artifactId>smack</artifactId>
- <version>1.5.0</version>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>jivesoftware</groupId>
<artifactId>smackx</artifactId>
- <version>1.5.0</version>
+ <version>2.2.1</version>
</dependency>
<dependency>
<groupId>activesoap</groupId>
@@ -753,6 +759,20 @@
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>avalon-framework</groupId>
+ <artifactId>avalon-framework</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>logkit</groupId>
+ <artifactId>logkit</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>commons-net</groupId>
@@ -788,7 +808,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
- <version>10.1.1.0</version>
+ <version>10.2.1.6</version>
</dependency>
<dependency>
<groupId>drools</groupId>
@@ -829,6 +849,38 @@
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-kernel</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-system</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-security</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-j2ee</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-common</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-management</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-naming</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-deployment</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -1013,6 +1065,12 @@
<groupId>org.jencks</groupId>
<artifactId>jencks</artifactId>
<version>${jencks-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
@@ -1050,11 +1108,19 @@
<version>3.8.1</version>
</dependency>
<dependency>
- <groupId>lingo</groupId>
+ <groupId>org.logicblaze.lingo</groupId>
<artifactId>lingo</artifactId>
- <version>1.1</version>
+ <version>1.3</version>
<exclusions>
<exclusion>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-transaction</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>geronimo</groupId>
+ <artifactId>geronimo-connector</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
</exclusion>
@@ -1087,11 +1153,15 @@
<artifactId>geronimo-spec-j2ee-connector</artifactId>
</exclusion>
<exclusion>
- <groupId>activemq</groupId>
- <artifactId>activemq</artifactId>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activeio-core</artifactId>
</exclusion>
<exclusion>
- <groupId>activemq</groupId>
+ <groupId>incubator-activemq</groupId>
<artifactId>activemq-ra</artifactId>
</exclusion>
<exclusion>
@@ -1203,6 +1273,12 @@
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
<version>${xbean-version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>xerces</groupId>
@@ -1411,6 +1487,12 @@
<groupId>tranql</groupId>
<artifactId>tranql-connector</artifactId>
<version>1.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>axion</groupId>
+ <artifactId>axion</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>wss4j</groupId>
@@ -1556,6 +1638,14 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>maven-jetty6-plugin</artifactId>
<version>${jetty-version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ </configuration>
</plugin>
</plugins>
</pluginManagement>
Modified: incubator/servicemix/trunk/web/servicemix-web-console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/trunk/web/servicemix-web-console/pom.xml?view=diff&rev=480328&r1=480327&r2=480328
==============================================================================
--- incubator/servicemix/trunk/web/servicemix-web-console/pom.xml (original)
+++ incubator/servicemix/trunk/web/servicemix-web-console/pom.xml Tue Nov 28 17:54:10 2006
@@ -147,6 +147,11 @@
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-audit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${spring-version}</version>
+ </dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>