You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by jb...@apache.org on 2010/11/19 15:56:26 UTC
svn commit: r1036880 - in
/servicemix/components/engines/servicemix-wsn2005/trunk: .gitignore pom.xml
Author: jbonofre
Date: Fri Nov 19 14:56:26 2010
New Revision: 1036880
URL: http://svn.apache.org/viewvc?rev=1036880&view=rev
Log:
Cleanup POM and dependencies alignment.
Added:
servicemix/components/engines/servicemix-wsn2005/trunk/.gitignore
Modified:
servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml
Added: servicemix/components/engines/servicemix-wsn2005/trunk/.gitignore
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-wsn2005/trunk/.gitignore?rev=1036880&view=auto
==============================================================================
--- servicemix/components/engines/servicemix-wsn2005/trunk/.gitignore (added)
+++ servicemix/components/engines/servicemix-wsn2005/trunk/.gitignore Fri Nov 19 14:56:26 2010
@@ -0,0 +1,5 @@
+target
+.project
+.classpath
+.settings
+*.i??
\ No newline at end of file
Modified: servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml
URL: http://svn.apache.org/viewvc/servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml?rev=1036880&r1=1036879&r2=1036880&view=diff
==============================================================================
--- servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml (original)
+++ servicemix/components/engines/servicemix-wsn2005/trunk/pom.xml Fri Nov 19 14:56:26 2010
@@ -1,258 +1,267 @@
<?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">
-<!--
+<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">
+
+ <!--
+
+ 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>components-pom</artifactId>
+ <version>6-SNAPSHOT</version>
+ <relativePath>../../components-pom/pom.xml</relativePath>
+ </parent>
- 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>components-pom</artifactId>
- <version>6-SNAPSHOT</version>
- <relativePath>../../components-pom/pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-wsn2005</artifactId>
- <version>2010.02-SNAPSHOT</version>
- <packaging>jbi-component</packaging>
-
- <name>Apache ServiceMix :: Components :: WS-Notification Service Engine</name>
-
- <scm>
- <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/components/engines/servicemix-wsn2005/trunk</connection>
- <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/components/engines/servicemix-wsn2005/trunk</developerConnection>
- <url>http://svn.apache.org/viewcvs.cgi/servicemix/components/engines/servicemix-wsn2005/trunk</url>
- </scm>
-
- <properties>
- <activemq-version>5.4.1</activemq-version>
- <xbean-version>3.4.3</xbean-version>
- <cxf-version>2.2.11</cxf-version>
-
- <servicemix.osgi.import>
- !org.apache.servicemix.wsn*,
- !META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.wsn,
- javax.annotation;resolution:=optional,
- org.apache.servicemix;resolution:=optional,
- org.apache.servicemix.client*;resolution:=optional,
- org.apache.servicemix.common,
- org.apache.servicemix.common.osgi,
- org.apache.servicemix.executors.impl,
- org.apache.servicemix.jbi.resolver;resolution:=optional,
- org.apache.xbean.spring.context.v2,
- org.springframework.beans.factory.xml,
- sun.misc;resolution:=optional,
- *
- </servicemix.osgi.import>
- <servicemix.osgi.export>
- org.apache.servicemix.wsn*;version=${project.version},
- META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.wsn
- </servicemix.osgi.export>
- <servicemix.osgi.bundles>
- org.springframework.core,
- org.springframework.beans,
- org.springframework.context
- </servicemix.osgi.bundles>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-shared</artifactId>
- <exclusions>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-spring</artifactId>
- <version>${xbean-version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.activemq</groupId>
- <artifactId>activemq-core</artifactId>
- <version>${activemq-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
- <version>1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <version>1.1.1</version>
- </dependency>
- <dependency>
- <groupId>opensymphony</groupId>
- <artifactId>quartz</artifactId>
- <version>1.6.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-components</artifactId>
- <version>${servicemix.version}</version>
- <scope>test</scope>
- </dependency>
- <!-- TODO: make sure this gets down to test scope -->
- <!-- This is currently not possible due to the PublisherComponent -->
- <dependency>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix-core</artifactId>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <groupId>xalan</groupId>
- <artifactId>xalan</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.springframework</groupId>
- <artifactId>spring-jmx</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.servicemix.tooling</groupId>
- <artifactId>jbi-maven-plugin</artifactId>
- <configuration>
- <type>service-engine</type>
- <component>org.apache.servicemix.wsn.component.WSNComponent</component>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.xbean</groupId>
- <artifactId>maven-xbean-plugin</artifactId>
- <executions>
- <execution>
- <configuration>
- <namespace>http://servicemix.apache.org/wsn/1.0</namespace>
- <srcDir>${basedir}/src/main/java/org/apache/servicemix/wsn/spring</srcDir>
- </configuration>
- <goals>
- <goal>mapping</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-codegen-plugin</artifactId>
- <version>${cxf-version}</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <configuration>
- <sourceRoot>${basedir}/target/jaxws</sourceRoot>
- <wsdlOptions>
- <wsdlOption>
- <wsdl>${basedir}/src/main/resources/org/apache/servicemix/wsn/wsn.wsdl</wsdl>
- <extraargs>
- <extraarg>-verbose</extraarg>
- </extraargs>
- </wsdlOption>
- </wsdlOptions>
- </configuration>
- <goals>
- <goal>wsdl2java</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <argLine>-Dactivemq.port1=${port1} -Dactivemq.port2=${port2} -Xmx1024m</argLine>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.4</version>
- <executions>
- <execution>
- <id>reserve-network-port</id>
- <goals>
- <goal>reserve-network-port</goal>
- </goals>
- <phase>process-resources</phase>
- <configuration>
- <portNames>
- <portName>port1</portName>
- <portName>port2</portName>
- </portNames>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
+ <artifactId>servicemix-wsn2005</artifactId>
+ <version>2010.02-SNAPSHOT</version>
+ <packaging>jbi-component</packaging>
+
+ <name>Apache ServiceMix :: Components :: WS-Notification Service Engine</name>
+
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/servicemix/components/engines/servicemix-wsn2005/trunk</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/servicemix/components/engines/servicemix-wsn2005/trunk</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/servicemix/components/engines/servicemix-wsn2005/trunk</url>
+ </scm>
+
+ <properties>
+ <activemq.version>5.4.1</activemq.version>
+ <cxf.version>2.2.11</cxf.version>
+ <geronimo-annotation.version>1.1.1</geronimo-annotation.version>
+ <geronimo-jaxws.version>1.0</geronimo-jaxws.version>
+ <geronimo-ws-metadata.version>1.1.2</geronimo-ws-metadata.version>
+ <quartz.version>1.8.3</quartz.version>
+ <xbean.version>3.7</xbean.version>
+
+ <servicemix.osgi.import>
+ !org.apache.servicemix.wsn*,
+ !META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.wsn,
+ javax.annotation;resolution:=optional,
+ org.apache.servicemix;resolution:=optional,
+ org.apache.servicemix.client*;resolution:=optional,
+ org.apache.servicemix.common,
+ org.apache.servicemix.common.osgi,
+ org.apache.servicemix.executors.impl,
+ org.apache.servicemix.jbi.resolver;resolution:=optional,
+ org.apache.xbean.spring.context.v2,
+ org.springframework.beans.factory.xml,
+ sun.misc;resolution:=optional,
+ *
+ </servicemix.osgi.import>
+ <servicemix.osgi.export>
+ org.apache.servicemix.wsn*;version=${project.version},
+ META-INF.services.org.apache.xbean.spring.http.servicemix.apache.org.wsn
+ </servicemix.osgi.export>
+ <servicemix.osgi.bundles>
+ org.springframework.core,
+ org.springframework.beans,
+ org.springframework.context
+ </servicemix.osgi.bundles>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.activemq</groupId>
+ <artifactId>activemq-core</artifactId>
+ <version>${activemq.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-annotation_1.0_spec</artifactId>
+ <version>${geronimo-annotation.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jaxws_2.1_spec</artifactId>
+ <version>${geronimo-jaxws.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jta_1.1_spec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
+ <version>${geronimo-ws-metadata.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-shared</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ </dependency>
+
+ <!-- provided -->
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-core</artifactId>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jmx</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.specs</groupId>
+ <artifactId>org.apache.servicemix.specs.jbi-api-1.0</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-spring</artifactId>
+ <version>${xbean.version}</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- test -->
+ <dependency>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix-components</artifactId>
+ <version>${servicemix.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz</artifactId>
+ <version>${quartz.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>jbi-maven-plugin</artifactId>
+ <configuration>
+ <type>service-engine</type>
+ <component>org.apache.servicemix.wsn.component.WSNComponent</component>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>maven-xbean-plugin</artifactId>
+ <executions>
+ <execution>
+ <configuration>
+ <namespace>http://servicemix.apache.org/wsn/1.0</namespace>
+ <srcDir>${basedir}/src/main/java/org/apache/servicemix/wsn/spring</srcDir>
+ </configuration>
+ <goals>
+ <goal>mapping</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-codegen-plugin</artifactId>
+ <version>${cxf.version}</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <configuration>
+ <sourceRoot>${basedir}/target/jaxws</sourceRoot>
+ <wsdlOptions>
+ <wsdlOption>
+ <wsdl>${basedir}/src/main/resources/org/apache/servicemix/wsn/wsn.wsdl</wsdl>
+ <extraargs>
+ <extraarg>-verbose</extraarg>
+ </extraargs>
+ </wsdlOption>
+ </wsdlOptions>
+ </configuration>
+ <goals>
+ <goal>wsdl2java</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <argLine>-Dactivemq.port1=${port1} -Dactivemq.port2=${port2} -Xmx1024m</argLine>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.4</version>
+ <executions>
+ <execution>
+ <id>reserve-network-port</id>
+ <goals>
+ <goal>reserve-network-port</goal>
+ </goals>
+ <phase>process-resources</phase>
+ <configuration>
+ <portNames>
+ <portName>port1</portName>
+ <portName>port2</portName>
+ </portNames>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>