You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by lh...@apache.org on 2010/11/05 13:29:30 UTC
svn commit: r1031538 - in /servicemix/components:
bindings/servicemix-http/trunk/ bindings/servicemix-jms/trunk/
bindings/servicemix-smpp/trunk/ bindings/servicemix-vfs/trunk/
components-pom/trunk/ engines/servicemix-eip/trunk/
engines/servicemix-jsr18...
Author: lhein
Date: Fri Nov 5 12:29:30 2010
New Revision: 1031538
URL: http://svn.apache.org/viewvc?rev=1031538&view=rev
Log:
fixed several errors regarding missing variables which were renamed in components-pom. also added org.osgi.compendium dep back to dep management as it made servicemix-exec unable to build. I added configuration for the maven-clean-plugin in the component pom to wipe out the folders "rootDir" and "activemq-data" from every module folder an mvn clean goal. This helps fixing an issue where the activemq-data folder made tests fail.
Modified:
servicemix/components/bindings/servicemix-http/trunk/pom.xml
servicemix/components/bindings/servicemix-jms/trunk/pom.xml
servicemix/components/bindings/servicemix-smpp/trunk/pom.xml
servicemix/components/bindings/servicemix-vfs/trunk/pom.xml
servicemix/components/components-pom/trunk/pom.xml
servicemix/components/engines/servicemix-eip/trunk/pom.xml
servicemix/components/engines/servicemix-jsr181/trunk/pom.xml
servicemix/components/engines/servicemix-quartz/trunk/pom.xml
servicemix/components/engines/servicemix-saxon/trunk/pom.xml
servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml
Modified: servicemix/components/bindings/servicemix-http/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-http/trunk/pom.xml?rev=1031538&r1=1031537&r2=1031538&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-http/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-http/trunk/pom.xml Fri Nov 5 12:29:30 2010
@@ -181,7 +181,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-components</artifactId>
- <version>${servicemix-version}</version>
+ <version>${servicemix.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -193,32 +193,32 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -250,7 +250,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
- <version>${servicemix-shared-version}</version>
+ <version>${servicemix-shared.version}</version>
</dependency>
</dependencies>
@@ -263,7 +263,7 @@
<type>binding-component</type>
<bootstrap>org.apache.servicemix.http.HttpBootstrap</bootstrap>
<component>org.apache.servicemix.http.HttpComponent</component>
- <serviceUnitAnalyzer>org.apache.servicemix.http.packaging.HttpServiceUnitAnalyzer</serviceUnitAnalyzer>
+ <serviceUnitAnalyzerClass>org.apache.servicemix.http.packaging.HttpServiceUnitAnalyzer</serviceUnitAnalyzerClass>
</configuration>
</plugin>
<plugin>
Modified: servicemix/components/bindings/servicemix-jms/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-jms/trunk/pom.xml?rev=1031538&r1=1031537&r2=1031538&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-jms/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-jms/trunk/pom.xml Fri Nov 5 12:29:30 2010
@@ -79,7 +79,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
- <version>${servicemix-shared-version}</version>
+ <version>${servicemix-shared.version}</version>
<classifier>sources</classifier>
<scope>provided</scope>
<optional>true</optional>
@@ -122,7 +122,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-components</artifactId>
- <version>${servicemix-version}</version>
+ <version>${servicemix.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -203,37 +203,37 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-aop</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
<scope>provided</scope>
</dependency>
<!-- for unit/integration testing -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -282,7 +282,7 @@
<type>binding-component</type>
<bootstrap>org.apache.servicemix.jms.JmsBootstrap</bootstrap>
<component>org.apache.servicemix.jms.JmsComponent</component>
- <serviceUnitAnalyzer>org.apache.servicemix.jms.packaging.JmsServiceUnitAnalyzer</serviceUnitAnalyzer>
+ <serviceUnitAnalyzerClass>org.apache.servicemix.jms.packaging.JmsServiceUnitAnalyzer</serviceUnitAnalyzerClass>
</configuration>
</plugin>
<plugin>
Modified: servicemix/components/bindings/servicemix-smpp/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-smpp/trunk/pom.xml?rev=1031538&r1=1031537&r2=1031538&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-smpp/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-smpp/trunk/pom.xml Fri Nov 5 12:29:30 2010
@@ -1,5 +1,5 @@
<?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:schemaInstance="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<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
@@ -110,7 +110,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-components</artifactId>
- <version>${servicemix-version}</version>
+ <version>${servicemix.version}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified: servicemix/components/bindings/servicemix-vfs/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/bindings/servicemix-vfs/trunk/pom.xml?rev=1031538&r1=1031537&r2=1031538&view=diff
==============================================================================
--- servicemix/components/bindings/servicemix-vfs/trunk/pom.xml (original)
+++ servicemix/components/bindings/servicemix-vfs/trunk/pom.xml Fri Nov 5 12:29:30 2010
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<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/xsd/maven-4_0_0.xsd">
+<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
Modified: servicemix/components/components-pom/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/components-pom/trunk/pom.xml?rev=1031538&r1=1031537&r2=1031538&view=diff
==============================================================================
--- servicemix/components/components-pom/trunk/pom.xml (original)
+++ servicemix/components/components-pom/trunk/pom.xml Fri Nov 5 12:29:30 2010
@@ -24,7 +24,6 @@
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-pom</artifactId>
<version>5</version>
- <relativePath>../../servicemix-pom/pom.xml</relativePath>
</parent>
<groupId>org.apache.servicemix</groupId>
@@ -77,6 +76,7 @@
<!-- OSGi -->
<osgi.core.version>4.2.0</osgi.core.version>
+ <osgi.compendium.version>4.2.0</osgi.compendium.version>
<!-- Other Runtime Dependencies -->
<commons-logging.version>1.1.1</commons-logging.version>
@@ -333,6 +333,11 @@
<version>${osgi.core.version}</version>
</dependency>
<dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <version>${osgi.compendium.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
<version>${spring.version}</version>
@@ -654,6 +659,23 @@
<useDefaultManifestFile>true</useDefaultManifestFile>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ <version>2.4.1</version>
+ <configuration>
+ <filesets>
+ <fileset>
+ <directory>activemq-data</directory>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ <fileset>
+ <directory>rootDir</directory>
+ <followSymlinks>false</followSymlinks>
+ </fileset>
+ </filesets>
+ </configuration>
+ </plugin>
</plugins>
</build>
<reporting>
Modified: servicemix/components/engines/servicemix-eip/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-eip/trunk/pom.xml?rev=1031538&r1=1031537&r2=1031538&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-eip/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-eip/trunk/pom.xml Fri Nov 5 12:29:30 2010
@@ -127,7 +127,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-jms</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -156,7 +156,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-common</artifactId>
- <version>${servicemix-shared-version}</version>
+ <version>${servicemix-shared.version}</version>
<classifier>sources</classifier>
<scope>provided</scope>
<optional>true</optional>
@@ -171,7 +171,7 @@
<configuration>
<type>service-engine</type>
<component>org.apache.servicemix.eip.EIPComponent</component>
- <serviceUnitAnalyzer>org.apache.servicemix.eip.packaging.EipServiceUnitAnalyzer</serviceUnitAnalyzer>
+ <serviceUnitAnalyzerClass>org.apache.servicemix.eip.packaging.EipServiceUnitAnalyzer</serviceUnitAnalyzerClass>
</configuration>
</plugin>
<plugin>
Modified: servicemix/components/engines/servicemix-jsr181/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-jsr181/trunk/pom.xml?rev=1031538&r1=1031537&r2=1031538&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-jsr181/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-jsr181/trunk/pom.xml Fri Nov 5 12:29:30 2010
@@ -303,7 +303,7 @@
<configuration>
<type>service-engine</type>
<component>org.apache.servicemix.jsr181.Jsr181Component</component>
- <serviceUnitAnalyzer>org.apache.servicemix.jsr181.packaging.Jsr181ServiceUnitAnalyzer</serviceUnitAnalyzer>
+ <serviceUnitAnalyzerClass>org.apache.servicemix.jsr181.packaging.Jsr181ServiceUnitAnalyzer</serviceUnitAnalyzerClass>
</configuration>
</plugin>
<plugin>
@@ -345,7 +345,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>build</artifactId>
- <version>${servicemix-version}</version>
+ <version>${servicemix.version}</version>
</dependency>
</dependencies>
<!-- Skip Jsr181ComplexPojoTest.java -->
Modified: servicemix/components/engines/servicemix-quartz/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-quartz/trunk/pom.xml?rev=1031538&r1=1031537&r2=1031538&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-quartz/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-quartz/trunk/pom.xml Fri Nov 5 12:29:30 2010
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-context-support</artifactId>
- <version>${spring-version}</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.stream</groupId>
Modified: servicemix/components/engines/servicemix-saxon/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-saxon/trunk/pom.xml?rev=1031538&r1=1031537&r2=1031538&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-saxon/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-saxon/trunk/pom.xml Fri Nov 5 12:29:30 2010
@@ -125,7 +125,7 @@
<configuration>
<type>service-engine</type>
<component>org.apache.servicemix.saxon.SaxonComponent</component>
- <serviceUnitAnalyzer>org.apache.servicemix.saxon.packaging.SaxonServiceUnitAnalyzer</serviceUnitAnalyzer>
+ <serviceUnitAnalyzerClass>org.apache.servicemix.saxon.packaging.SaxonServiceUnitAnalyzer</serviceUnitAnalyzerClass>
</configuration>
</plugin>
<plugin>
Modified: servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml?rev=1031538&r1=1031537&r2=1031538&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml Fri Nov 5 12:29:30 2010
@@ -146,7 +146,7 @@
<dependency>
<groupId>org.apache.servicemix</groupId>
<artifactId>servicemix-components</artifactId>
- <version>${servicemix-version}</version>
+ <version>${servicemix.version}</version>
<scope>test</scope>
</dependency>
<!-- TODO: make sure this gets down to test scope -->