You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by da...@apache.org on 2008/01/09 04:26:18 UTC
svn commit: r610265 - in /openejb/trunk/openejb3:
assembly/openejb-standalone/pom.xml
assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml pom.xml
server/openejb-cxf/pom.xml
Author: dain
Date: Tue Jan 8 19:26:17 2008
New Revision: 610265
URL: http://svn.apache.org/viewvc?rev=610265&view=rev
Log:
Prune cxf dependencies
Modified:
openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
openejb/trunk/openejb3/pom.xml
openejb/trunk/openejb3/server/openejb-cxf/pom.xml
Modified: openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml?rev=610265&r1=610264&r2=610265&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-standalone/pom.xml Tue Jan 8 19:26:17 2008
@@ -61,7 +61,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.2</version>
@@ -75,7 +75,7 @@
</execution>
</executions>
</plugin>
- <plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>2.1</version>
@@ -168,10 +168,6 @@
<artifactId>geronimo-jaxr_1.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.1_spec</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
<version>${version}</version>
@@ -228,7 +224,7 @@
<id>itest</id>
<properties>
<openejb.debug.suspend>n</openejb.debug.suspend>
- <openejb.debug.port>5005</openejb.debug.port>
+ <openejb.debug.port>5005</openejb.debug.port>
</properties>
<dependencies>
<dependency>
@@ -260,40 +256,40 @@
<goal>run</goal>
</goals>
<configuration>
- <tasks>
- <property name="targetDir" value="${basedir}/target/" />
- <property name="openejb.home" value="${targetDir}/openejb-${pom.version}" />
- <property name="openejb.dist" value="${targetDir}/openejb-${pom.version}-bin.zip" />
- <property name="openejb.version" value="${pom.version}" />
-
- <unjar src="${openejb.dist}" dest="${targetDir}" />
- <copy file="${targetDir}/openejb-${pom.version}-test.jar" todir="${openejb.home}/apps" />
-
- <java classname="org.apache.openejb.test.Main" fork="yes">
- <classpath>
- <pathelement location="${targetDir}/openejb-${pom.version}-test.jar" />
- <fileset dir="${openejb.home}/lib">
- <include name="*.jar" />
- </fileset>
- </classpath>
- <sysproperty key="openejb.home" value="${openejb.home}" />
- <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${openejb.debug.suspend},address=${openejb.debug.port}" />
- <arg value="local" />
- </java>
-
- <java jar="target/openejb-${openejb.version}-test.jar" fork="yes">
- <sysproperty key="openejb.home" value="${openejb.home}" />
- <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${openejb.debug.suspend},address=${openejb.debug.port}" />
- <arg value="remote" />
- </java>
-
- <java jar="target/openejb-${openejb.version}-test.jar" fork="yes">
- <sysproperty key="openejb.home" value="${openejb.home}" />
- <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${openejb.debug.suspend},address=${openejb.debug.port}" />
- <arg value="http"/>
- </java>
-
- </tasks>
+ <tasks>
+ <property name="targetDir" value="${basedir}/target/" />
+ <property name="openejb.home" value="${targetDir}/openejb-${pom.version}" />
+ <property name="openejb.dist" value="${targetDir}/openejb-${pom.version}-bin.zip" />
+ <property name="openejb.version" value="${pom.version}" />
+
+ <unjar src="${openejb.dist}" dest="${targetDir}" />
+ <copy file="${targetDir}/openejb-${pom.version}-test.jar" todir="${openejb.home}/apps" />
+
+ <java classname="org.apache.openejb.test.Main" fork="yes">
+ <classpath>
+ <pathelement location="${targetDir}/openejb-${pom.version}-test.jar" />
+ <fileset dir="${openejb.home}/lib">
+ <include name="*.jar" />
+ </fileset>
+ </classpath>
+ <sysproperty key="openejb.home" value="${openejb.home}" />
+ <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${openejb.debug.suspend},address=${openejb.debug.port}" />
+ <arg value="local" />
+ </java>
+
+ <java jar="target/openejb-${openejb.version}-test.jar" fork="yes">
+ <sysproperty key="openejb.home" value="${openejb.home}" />
+ <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${openejb.debug.suspend},address=${openejb.debug.port}" />
+ <arg value="remote" />
+ </java>
+
+ <java jar="target/openejb-${openejb.version}-test.jar" fork="yes">
+ <sysproperty key="openejb.home" value="${openejb.home}" />
+ <jvmarg value="-agentlib:jdwp=transport=dt_socket,server=y,suspend=${openejb.debug.suspend},address=${openejb.debug.port}" />
+ <arg value="http"/>
+ </java>
+
+ </tasks>
</configuration>
</execution>
</executions>
Modified: openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml?rev=610265&r1=610264&r2=610265&view=diff
==============================================================================
--- openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml (original)
+++ openejb/trunk/openejb3/assembly/openejb-tomcat/openejb-tomcat-webapp/pom.xml Tue Jan 8 19:26:17 2008
@@ -142,10 +142,6 @@
<artifactId>geronimo-jaxr_1.0_spec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.1_spec</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
<version>${version}</version>
Modified: openejb/trunk/openejb3/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/pom.xml?rev=610265&r1=610264&r2=610265&view=diff
==============================================================================
--- openejb/trunk/openejb3/pom.xml (original)
+++ openejb/trunk/openejb3/pom.xml Tue Jan 8 19:26:17 2008
@@ -699,11 +699,6 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-saaj_1.1_spec</artifactId>
- <version>1.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-stax-api_1.0_spec</artifactId>
<version>1.0</version>
</dependency>
@@ -761,6 +756,11 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>2.0.5</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-finder</artifactId>
<version>${xbeanVersion}</version>
@@ -872,12 +872,48 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-saaj-api</artifactId>
<version>1.3</version>
- <exclusions>
- <exclusion>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- </exclusion>
- </exclusions>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </exclusion>
+ <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>
+ </exclusions>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
Modified: openejb/trunk/openejb3/server/openejb-cxf/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/server/openejb-cxf/pom.xml?rev=610265&r1=610264&r2=610265&view=diff
==============================================================================
--- openejb/trunk/openejb3/server/openejb-cxf/pom.xml (original)
+++ openejb/trunk/openejb3/server/openejb-cxf/pom.xml Tue Jan 8 19:26:17 2008
@@ -29,19 +29,19 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-cxf</artifactId>
<packaging>jar</packaging>
- <name>OpenEJB :: Server :: CXF</name>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>rat-maven-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>src/main/resources/META-INF/cxf.extension</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
+ <name>OpenEJB :: Server :: CXF</name>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>rat-maven-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/main/resources/META-INF/cxf.extension</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
</build>
<dependencies>
<dependency>
@@ -64,9 +64,45 @@
<artifactId>jsr181-api</artifactId>
</exclusion>
<exclusion>
+ <groupId>javax.xml.soap</groupId>
+ <artifactId>saaj-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>javax.xml.bind</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-impl</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-javamail_1.4_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -76,6 +112,10 @@
<version>2.0.2-incubator</version>
<exclusions>
<exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</exclusion>
@@ -96,6 +136,18 @@
<version>2.0.2-incubator</version>
<exclusions>
<exclusion>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>javax.annotation</groupId>
<artifactId>jsr250-api</artifactId>
</exclusion>
@@ -108,6 +160,12 @@
<artifactId>jaxb-impl</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+
+ <!-- Excluded above and reincluded here so version matches the version used by the rest of OpenEJB -->
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
</dependency>
</dependencies>
</project>