You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mi...@apache.org on 2010/06/14 07:40:04 UTC
svn commit: r954370 - in /ode/trunk: axis2-war/pom.xml
axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml axis2/pom.xml
distro/src/main/assembly/war.xml pom.xml utils/pom.xml
Author: milinda
Date: Mon Jun 14 05:40:03 2010
New Revision: 954370
URL: http://svn.apache.org/viewvc?rev=954370&view=rev
Log:
Fix for ODE WAR distribution's build issues. There is a issue in InstanceManagementDeployment. Will fix it separately.
Modified:
ode/trunk/axis2-war/pom.xml
ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml
ode/trunk/axis2/pom.xml
ode/trunk/distro/src/main/assembly/war.xml
ode/trunk/pom.xml
ode/trunk/utils/pom.xml
Modified: ode/trunk/axis2-war/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/pom.xml?rev=954370&r1=954369&r2=954370&view=diff
==============================================================================
--- ode/trunk/axis2-war/pom.xml (original)
+++ ode/trunk/axis2-war/pom.xml Mon Jun 14 05:40:03 2010
@@ -109,22 +109,25 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws</artifactId>
<version>${axis2.version}</version>
- </dependency>
- <dependency>
+ </dependency>
+ <!-- According to Axis2 team, axis2 get this dependency from JDK
+ This jar was there in 1.4.1. release -->
+ <!--dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jaxws-api</artifactId>
<version>${axis2.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-json</artifactId>
<version>${axis2.version}</version>
</dependency>
- <dependency>
+ <!-- deprecated jar. This jar was there in 1.4.1 release -->
+ <!--dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-jws-api</artifactId>
<version>${axis2.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-metadata</artifactId>
Modified: ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml?rev=954370&r1=954369&r2=954370&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml (original)
+++ ode/trunk/axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml Mon Jun 14 05:40:03 2010
@@ -176,8 +176,6 @@
<!-- Transport Outs -->
<!-- ================================================= -->
- <transportSender name="tcp"
- class="org.apache.axis2.transport.tcp.TCPTransportSender"/>
<transportSender name="local"
class="org.apache.axis2.transport.local.LocalTransportSender"/>
<transportSender name="http"
Modified: ode/trunk/axis2/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2/pom.xml?rev=954370&r1=954369&r2=954370&view=diff
==============================================================================
--- ode/trunk/axis2/pom.xml (original)
+++ ode/trunk/axis2/pom.xml Mon Jun 14 05:40:03 2010
@@ -79,6 +79,54 @@
<artifactId>ode-utils</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-adb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-codegen</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-java2wsdl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-saaj</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-jms</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ws.commons.axiom</groupId>
+ <artifactId>axiom-dom</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet.version}</version>
@@ -104,25 +152,25 @@
</dependency>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/ProcessManagementTest.java</exclude>
- <exclude>**/ExecutionPathTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/ProcessManagementTest.java</exclude>
+ <exclude>**/ExecutionPathTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: ode/trunk/distro/src/main/assembly/war.xml
URL: http://svn.apache.org/viewvc/ode/trunk/distro/src/main/assembly/war.xml?rev=954370&r1=954369&r2=954370&view=diff
==============================================================================
--- ode/trunk/distro/src/main/assembly/war.xml (original)
+++ ode/trunk/distro/src/main/assembly/war.xml Mon Jun 14 05:40:03 2010
@@ -18,151 +18,151 @@
~ under the License.
-->
<assembly>
- <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
- <id></id>
- <includeBaseDirectory>true</includeBaseDirectory>
- <formats>
- <format>zip</format>
- </formats>
-
- <fileSets>
-
- <fileSet>
- <directory>src/examples-war</directory>
- <outputDirectory>/examples</outputDirectory>
- </fileSet>
-
- <fileSet>
- <directory>src/bin</directory>
- <outputDirectory>/bin</outputDirectory>
- <fileMode>755</fileMode>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../dao-jpa-ojpa-derby/target/</directory>
- <outputDirectory>/sql</outputDirectory>
- <includes>
- <include>*.sql</include>
- </includes>
- <excludes>
- <exclude>*partial*.sql</exclude>
- </excludes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../</directory>
- <outputDirectory>/</outputDirectory>
- <includes>
- <include>LICENSE</include>
- <include>README</include>
- <include>NOTICE</include>
- <include>RELEASE_NOTES</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/license</directory>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>*LICENSE</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions/e4x</directory>
- <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
- <includes>
- <include>README</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions/e4x/target</directory>
- <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
- <includes>
- <include>ode-extensions-e4x*.jar</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions/jms-eventpublisher</directory>
- <outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory>
- <includes>
- <include>README</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions/jms-eventpublisher/target</directory>
- <outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory>
- <includes>
- <include>ode-extensions-jms*.jar</include>
- </includes>
- </fileSet>
-
- <fileSet>
- <directory>${basedir}/../extensions</directory>
- <outputDirectory>/extensions</outputDirectory>
- <includes>
- <include>README.extensions</include>
- </includes>
- </fileSet>
-
- </fileSets>
-
- <files>
- <file>
- <source>${basedir}/../axis2-war/target/ode-axis2-war-${project.version}.war</source>
- <outputDirectory>/</outputDirectory>
- <destName>ode.war</destName>
- </file>
- </files>
-
-
- <dependencySets>
-
- <dependencySet>
- <outputDirectory>/lib</outputDirectory>
- <includes>
- <include>org.apache.ode:ode-utils</include>
- <include>org.apache.ode:ode-tools</include>
- <include>org.apache.ode:ode-bpel-compiler</include>
- <include>org.apache.ode:ode-bpel-api</include>
- <include>org.apache.ode:ode-bpel-schemas</include>
- <include>commons-logging:commons-logging</include>
- <include>org.apache.ode:ode-utils</include>
- <include>commons-codec:commons-codec</include>
- <include>commons-collections:commons-collections</include>
- <include>commons-httpclient:commons-httpclient</include>
- <include>commons-pool:commons-pool</include>
- <include>net.sf.saxon:saxon</include>
- <include>net.sf.saxon:saxon-xpath</include>
- <include>net.sf.saxon:saxon-dom</include>
- <include>net.sf.saxon:saxon-xqj</include>
- <include>jaxen:jaxen</include>
- <include>log4j:log4j</include>
- <include>wsdl4j:wsdl4j</include>
- <include>xalan:xalan</include>
- <include>xerces:xercesImpl</include>
- </includes>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>/extensions/ode-extensions-e4x/lib</outputDirectory>
- <includes>
- <include>rhino:js</include>
- <include>commons-logging:commons-logging</include>
- </includes>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>/extensions/ode-extensions-jms-eventpublisher/lib</outputDirectory>
- <includes>
- <include>org.apache.activemq:apache-activemq</include>
- <include>org.apache.xmlbeans:xmlbeans</include>
- </includes>
- </dependencySet>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id></id>
+ <includeBaseDirectory>true</includeBaseDirectory>
+ <formats>
+ <format>zip</format>
+ </formats>
+
+ <fileSets>
+
+ <fileSet>
+ <directory>src/examples-war</directory>
+ <outputDirectory>/examples</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>src/bin</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <fileMode>755</fileMode>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../dao-jpa-ojpa-derby/target/</directory>
+ <outputDirectory>/sql</outputDirectory>
+ <includes>
+ <include>*.sql</include>
+ </includes>
+ <excludes>
+ <exclude>*partial*.sql</exclude>
+ </excludes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>LICENSE</include>
+ <include>README</include>
+ <include>NOTICE</include>
+ <include>RELEASE_NOTES</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/license</directory>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>*LICENSE</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions/e4x</directory>
+ <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
+ <includes>
+ <include>README</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions/e4x/target</directory>
+ <outputDirectory>/extensions/ode-extensions-e4x</outputDirectory>
+ <includes>
+ <include>ode-extensions-e4x*.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions/jms-eventpublisher</directory>
+ <outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory>
+ <includes>
+ <include>README</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions/jms-eventpublisher/target</directory>
+ <outputDirectory>/extensions/ode-extensions-jms-eventpublisher</outputDirectory>
+ <includes>
+ <include>ode-extensions-jms*.jar</include>
+ </includes>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../extensions</directory>
+ <outputDirectory>/extensions</outputDirectory>
+ <includes>
+ <include>README.extensions</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+
+ <files>
+ <file>
+ <source>${basedir}/../axis2-war/target/ode-axis2-war-${project.version}.war</source>
+ <outputDirectory>/</outputDirectory>
+ <destName>ode.war</destName>
+ </file>
+ </files>
+
+
+ <dependencySets>
+
+ <dependencySet>
+ <outputDirectory>/lib</outputDirectory>
+ <includes>
+ <include>org.apache.ode:ode-utils</include>
+ <include>org.apache.ode:ode-tools</include>
+ <include>org.apache.ode:ode-bpel-compiler</include>
+ <include>org.apache.ode:ode-bpel-api</include>
+ <include>org.apache.ode:ode-bpel-schemas</include>
+ <include>commons-logging:commons-logging</include>
+ <include>org.apache.ode:ode-utils</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-httpclient:commons-httpclient</include>
+ <include>commons-pool:commons-pool</include>
+ <include>net.sf.saxon:saxon</include>
+ <include>net.sf.saxon:saxon-xpath</include>
+ <include>net.sf.saxon:saxon-dom</include>
+ <include>net.sf.saxon:saxon-xqj</include>
+ <include>jaxen:jaxen</include>
+ <include>log4j:log4j</include>
+ <include>wsdl4j:wsdl4j</include>
+ <include>xalan:xalan</include>
+ <include>xerces:xercesImpl</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>/extensions/ode-extensions-e4x/lib</outputDirectory>
+ <includes>
+ <include>rhino:js</include>
+ <include>commons-logging:commons-logging</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>/extensions/ode-extensions-jms-eventpublisher/lib</outputDirectory>
+ <includes>
+ <include>org.apache.activemq:apache-activemq</include>
+ <include>org.apache.xmlbeans:xmlbeans</include>
+ </includes>
+ </dependencySet>
- </dependencySets>
+ </dependencySets>
</assembly>
Modified: ode/trunk/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/pom.xml?rev=954370&r1=954369&r2=954370&view=diff
==============================================================================
--- ode/trunk/pom.xml (original)
+++ ode/trunk/pom.xml Mon Jun 14 05:40:03 2010
@@ -39,42 +39,42 @@
<ode.version>1.3.5-SNAPSHOT</ode.version>
<activation.version>1.1</activation.version>
<annogen.version>0.1.0</annogen.version>
- <antlr.version>2.7.7</antlr.version>
- <axiom.version>1.2.7</axiom.version>
- <axis2.version>1.5</axis2.version>
+ <antlr.version>2.7.7</antlr.version>
+ <axiom.version>1.2.8</axiom.version>
+ <axis2.version>1.5.1</axis2.version>
<rampart.version>1.4</rampart.version>
<commons.codec.version>1.3</commons.codec.version>
- <backport.concurrent.version>3.1</backport.concurrent.version>
+ <backport.concurrent.version>3.1</backport.concurrent.version>
<commons.fileupload.version>1.2</commons.fileupload.version>
<commons.collections.version>3.2.1</commons.collections.version>
<commons.httpclient.version>3.1</commons.httpclient.version>
- <commons.io.version>1.4</commons.io.version>
+ <commons.io.version>1.4</commons.io.version>
<commons.lang.version>2.4</commons.lang.version>
<commons.logging.version>1.1</commons.logging.version>
<commons.pool.version>1.4</commons.pool.version>
<commons.primitives.version>1.0</commons.primitives.version>
- <commons.dbcp.version>1.2.1</commons.dbcp.version>
- <httpcomponents.version>4.0-beta1</httpcomponents.version>
- <jaxb-api.version>2.1</jaxb-api.version>
- <jaxb.version>2.1.6</jaxb.version>
- <jaxen.version>1.1.1</jaxen.version>
- <jettison.version>1.0-RC2</jettison.version>
- <jibx.version>1.1.5</jibx.version>
- <neethi.version>2.0.4</neethi.version>
- <woden.version>1.0M8</woden.version>
+ <commons.dbcp.version>1.2.1</commons.dbcp.version>
+ <httpcomponents.version>4.0</httpcomponents.version>
+ <jaxb-api.version>2.1</jaxb-api.version>
+ <jaxb.version>2.1.6</jaxb.version>
+ <jaxen.version>1.1.1</jaxen.version>
+ <jettison.version>1.0-RC2</jettison.version>
+ <jibx.version>1.1.5</jibx.version>
+ <neethi.version>2.0.4</neethi.version>
+ <woden.version>1.0M8</woden.version>
<wsdl4j.version>1.6.2</wsdl4j.version>
- <woodstox.version>3.2.4</woodstox.version>
- <javax.mail.version>1.4</javax.mail.version>
+ <woodstox.version>3.2.4</woodstox.version>
+ <javax.mail.version>1.4</javax.mail.version>
<hibernate.version>3.2.5.ga</hibernate.version>
- <spring.version>2.5.6</spring.version>
+ <spring.version>2.5.6</spring.version>
<geronimo.specs.version>1.0</geronimo.specs.version>
<geronimo.version>2.0.1</geronimo.version>
- <geronimo.activation.version>1.0.1</geronimo.activation.version>
- <geronimo.annotation.version>1.1</geronimo.annotation.version>
- <geronimo.javamail.version>1.2</geronimo.javamail.version>
- <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version>
+ <geronimo.activation.version>1.0.1</geronimo.activation.version>
+ <geronimo.annotation.version>1.1</geronimo.annotation.version>
+ <geronimo.javamail.version>1.2</geronimo.javamail.version>
+ <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version>
<geronimo.specs.jta.version>1.1</geronimo.specs.jta.version>
- <geronimo.specs.ejb.version>1.1</geronimo.specs.ejb.version>
+ <geronimo.specs.ejb.version>1.1</geronimo.specs.ejb.version>
<jetty.version>6.1.12rc1</jetty.version>
<jencks.version>2.1</jencks.version>
<jasper.version>4.2.20RC0</jasper.version>
@@ -87,56 +87,57 @@
<xmlresolver.version>1.2</xmlresolver.version>
<xmlbeans.version>2.3.0</xmlbeans.version>
<xstream.version>1.2</xstream.version>
- <junit.version>4.4</junit.version>
+ <junit.version>4.4</junit.version>
<hsqldb.version>1.8.0.7</hsqldb.version>
- <persistence-api.version>1.0</persistence-api.version>
- <xalan.version>2.7.1</xalan.version>
+ <persistence-api.version>1.0</persistence-api.version>
+ <xalan.version>2.7.1</xalan.version>
<ant.version>1.6.5</ant.version>
- <openjpa.version>1.2.1</openjpa.version>
+ <openjpa.version>1.2.1</openjpa.version>
<serp.version>1.13.1</serp.version>
- <dom4j.version>1.6.1</dom4j.version>
+ <dom4j.version>1.6.1</dom4j.version>
<derby.version>10.5.3.0_1</derby.version>
<jmock.version>1.2.0</jmock.version>
<xml.parser.version>2.6.2</xml.parser.version>
<activemq.version>4.1.1</activemq.version>
<xml-apis.version>1.3.04</xml-apis.version>
<servicemix.nmr.version>1.1.0-SNAPSHOT</servicemix.nmr.version>
+ <axis2.transport.version>1.0.0</axis2.transport.version>
</properties>
<modules>
- <module>agents</module>
- <module>utils</module>
- <module>jacob-ap</module>
- <module>jacob</module>
- <module>bpel-schemas</module>
- <module>bpel-scripts</module>
- <module>bpel-api</module>
- <module>bpel-api-jca</module>
- <module>bpel-dao</module>
- <module>bpel-obj</module>
- <module>dao-jpa</module>
- <module>jca-ra</module>
- <module>jca-server</module>
- <module>scheduler-simple</module>
- <module>bpel-compiler</module>
- <module>bpel-epr</module>
- <module>bpel-ql</module>
- <module>dao-hibernate</module>
- <module>tools</module>
- <module>bpel-store</module>
- <module>dao-jpa-ojpa-derby</module>
- <module>dao-hibernate-db</module>
- <module>bpel-runtime</module>
- <module>bpel-connector</module>
- <module>bpel-test</module>
- <module>axis2</module>
- <module>jbi</module>
- <module>jbi-bundle</module>
- <module>jbi-karaf</module>
- <module>distro/src/examples-jbi/maven2/ping-pong-osgi</module>
- <module>axis2-war</module>
- <module>distro</module>
+ <module>agents</module>
+ <module>utils</module>
+ <module>jacob-ap</module>
+ <module>jacob</module>
+ <module>bpel-schemas</module>
+ <module>bpel-scripts</module>
+ <module>bpel-api</module>
+ <module>bpel-api-jca</module>
+ <module>bpel-dao</module>
+ <module>bpel-obj</module>
+ <module>dao-jpa</module>
+ <module>jca-ra</module>
+ <module>jca-server</module>
+ <module>scheduler-simple</module>
+ <module>bpel-compiler</module>
+ <module>bpel-epr</module>
+ <module>bpel-ql</module>
+ <module>dao-hibernate</module>
+ <module>tools</module>
+ <module>bpel-store</module>
+ <module>dao-jpa-ojpa-derby</module>
+ <module>dao-hibernate-db</module>
+ <module>bpel-runtime</module>
+ <module>bpel-connector</module>
+ <!--module>bpel-test</module-->
+ <module>axis2</module>
+ <module>jbi</module>
+ <module>jbi-bundle</module>
+ <module>jbi-karaf</module>
+ <module>distro/src/examples-jbi/maven2/ping-pong-osgi</module>
+ <module>axis2-war</module>
+ <module>distro</module>
</modules>
<build>
@@ -151,7 +152,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.0.2</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -175,11 +176,11 @@
<artifactId>xdoclet-maven-plugin</artifactId>
<version>1.0</version>
<dependencies>
- <dependency>
- <groupId>xdoclet</groupId>
- <artifactId>xjavadoc</artifactId>
- <version>1.1-j5</version>
- </dependency>
+ <dependency>
+ <groupId>xdoclet</groupId>
+ <artifactId>xjavadoc</artifactId>
+ <version>1.1-j5</version>
+ </dependency>
</dependencies>
</plugin>
@@ -189,23 +190,23 @@
<version>${xmlbeans.version}</version>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>sql-maven-plugin</artifactId>
- <version>1.2</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- <version>${derby.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derbytools</artifactId>
- <version>${derby.version}</version>
- </dependency>
- </dependencies>
- </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>sql-maven-plugin</artifactId>
+ <version>1.2</version>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ </dependencies>
+ </plugin>
<!-- Allows direct usage of the javadoc:javadoc goal. -->
<plugin>
@@ -222,49 +223,53 @@
</build>
-
<!--|
| List of repositories for all the various dependencies,
| and Maven plugins.
|
-->
- <repositories>
- <repository>
- <id>servicemix-repo</id>
- <name>ServiceMix Repository</name>
- <url>https://repository.apache.org/content/groups/public</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <!--
- <repository>
- <id>servicemix</id>
- <name>Apache ServiceMix Repository</name>
- <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- -->
- <repository>
- <id>saxon-repo</id>
- <name>Saxon Repo</name>
- <url>http://people.apache.org/~rr/saxon-repo</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>servicemix-repo</id>
+ <name>ServiceMix Repository</name>
+ <url>https://repository.apache.org/content/groups/public</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <!--
+ <repository>
+ <id>servicemix</id>
+ <name>Apache ServiceMix Repository</name>
+ <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ -->
+ <repository>
+ <id>saxon-repo</id>
+ <name>Saxon Repo</name>
+ <url>http://people.apache.org/~rr/saxon-repo</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>central</id>
+ <name>Apache Maven Repo</name>
+ <url>http://repo1.maven.org/maven2/</url>
+ </repository>
+ </repositories>
<!--
<repositories>
@@ -505,7 +510,7 @@
<artifactId>axiom-impl</artifactId>
<version>${axiom.version}</version>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.ws.commons.axiom</groupId>
<artifactId>axiom-dom</artifactId>
<version>${axiom.version}</version>
@@ -555,11 +560,11 @@
<artifactId>commons-dbcp</artifactId>
<version>${commons.dbcp.version}</version>
</dependency>
- <dependency>
- <groupId>commons-primitives</groupId>
- <artifactId>commons-primitives</artifactId>
- <version>${commons.primitives.version}</version>
- </dependency>
+ <dependency>
+ <groupId>commons-primitives</groupId>
+ <artifactId>commons-primitives</artifactId>
+ <version>${commons.primitives.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-jta_1.1_spec</artifactId>
@@ -697,26 +702,26 @@
<artifactId>mail</artifactId>
<version>${javax.mail.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
- </dependency>
- <dependency>
- <groupId>net.sourceforge.serp</groupId>
- <artifactId>serp</artifactId>
- <version>${serp.version}</version>
- </dependency>
- <dependency>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- <version>${dom4j.version}</version>
- </dependency>
- <dependency>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- <version>${xml-apis.version}</version>
- </dependency>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
+ <artifactId>openjpa</artifactId>
+ <version>${openjpa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sourceforge.serp</groupId>
+ <artifactId>serp</artifactId>
+ <version>${serp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>${dom4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>${xml-apis.version}</version>
+ </dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
@@ -918,6 +923,11 @@
<version>${axis2.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-jms</artifactId>
+ <version>${axis2.transport.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
Modified: ode/trunk/utils/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/utils/pom.xml?rev=954370&r1=954369&r2=954370&view=diff
==============================================================================
--- ode/trunk/utils/pom.xml (original)
+++ ode/trunk/utils/pom.xml Mon Jun 14 05:40:03 2010
@@ -91,7 +91,11 @@
<dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-saaj</artifactId>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-jms</artifactId>
+ </dependency>
<dependency>
<groupId>net.sf.saxon</groupId>
<artifactId>saxon</artifactId>
Re: svn commit: r954370 - in /ode/trunk: axis2-war/pom.xml
axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml axis2/pom.xml
distro/src/main/assembly/war.xml pom.xml utils/pom.xml
Posted by Jeff Yu <je...@gmail.com>.
Hi，
The JDK version needs to be JDK5 for the maven build. In the V1.3.4, it
should be working fine with JDK5.
As with JDK6, it will have failed test cases in JBI module, which was
reported at here: https://issues.apache.org/jira/browse/ODE-860
Regards
Jeff
On Wed, Jun 30, 2010 at 10:47 AM, hbdrawn <hb...@163.com> wrote:
>
> i compared the current pom.xml in the trunk to the pom.xml in the
> tags/APACHE_ODE_1.3.4/. And the test is here,but it is distinct or separate
> in one place:
> <axiom.version>1.2.7</axiom.version>
> <axis2.version>1.3</axis2.version>
> <rampart.version>1.3</rampart.version>
> and the other is:
> <axiom.version>1.2.8</axiom.version>
> <axis2.version>1.5.1</axis2.version>
> <rampart.version>1.4</rampart.version>
> i want to compile ode V1.3.4 with maven ,and will it be a problem? and the
> jdk is 1.6 version.
> thanks all.
>
> --
> View this message in context:
> http://old.nabble.com/Re%3A-svn-commit%3A-r954370---in--ode-trunk%3A-axis2-war-pom.xml--axis2-war-src-main-webapp-WEB-INF-conf-axis2.xml-axis2-pom.xml--distro-src-main-assembly-war.xml-pom.xml-utils-pom.xml-tp29023280p29029860.html
> Sent from the Apache Ode Dev mailing list archive at Nabble.com.
>
>
--
Cheers,
Jeff Yu
----------------
blog: http://jeff.familyyu.net
Re: svn commit: r954370 - in /ode/trunk: axis2-war/pom.xml
axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml axis2/pom.xml
distro/src/main/assembly/war.xml pom.xml utils/pom.xml
Posted by hbdrawn <hb...@163.com>.
i compared the current pom.xml in the trunk to the pom.xml in the
tags/APACHE_ODE_1.3.4/. And the test is here,but it is distinct or separate
in one place:
<axiom.version>1.2.7</axiom.version>
<axis2.version>1.3</axis2.version>
<rampart.version>1.3</rampart.version>
and the other is:
<axiom.version>1.2.8</axiom.version>
<axis2.version>1.5.1</axis2.version>
<rampart.version>1.4</rampart.version>
i want to compile ode V1.3.4 with maven ,and will it be a problem? and the
jdk is 1.6 version.
thanks all.
--
View this message in context: http://old.nabble.com/Re%3A-svn-commit%3A-r954370---in--ode-trunk%3A-axis2-war-pom.xml--axis2-war-src-main-webapp-WEB-INF-conf-axis2.xml-axis2-pom.xml--distro-src-main-assembly-war.xml-pom.xml-utils-pom.xml-tp29023280p29029860.html
Sent from the Apache Ode Dev mailing list archive at Nabble.com.
Re: svn commit: r954370 - in /ode/trunk: axis2-war/pom.xml
axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml axis2/pom.xml
distro/src/main/assembly/war.xml pom.xml utils/pom.xml
Posted by Jeff Yu <je...@gmail.com>.
Hi Milinda,
No problems,,, I've just committed a fix to this, hope you don't mind. ;)
Regards
Jeff
On Wed, Jun 30, 2010 at 4:01 PM, Milinda Pathirage <
milinda.pathirage@gmail.com> wrote:
> Hi Jeff,
>
> Forgot to update it. Sorry for the inconvenience caused.
>
> thanks
> Milinda
>
> On Tue, Jun 29, 2010 at 6:19 PM, Jeff Yu <je...@gmail.com> wrote:
>
> > Hi Milinda,
> >
> > Any reasons that why we commented out the bpel-test module in maven
> build?
> > or forgot to update?
> >
> > Regards
> > Jeff
> >
> > On Mon, Jun 14, 2010 at 3:40 PM, <mi...@apache.org> wrote:
> >
> > > Author: milinda
> > > Date: Mon Jun 14 05:40:03 2010
> > > New Revision: 954370
> > >
> > > URL: http://svn.apache.org/viewvc?rev=954370&view=rev
> > > Log:
> > > Fix for ODE WAR distribution's build issues. There is a issue in
> > > InstanceManagementDeployment. Will fix it separately.
> > >
> > > Modified:
> > > ode/trunk/pom.xml
> > >
> > >
> > > Modified: ode/trunk/pom.xml
> > > URL:
> > >
> >
> http://svn.apache.org/viewvc/ode/trunk/pom.xml?rev=954370&r1=954369&r2=954370&view=diff
> > >
> > >
> >
> ==============================================================================
> > > --- ode/trunk/pom.xml (original)
> > > +++ ode/trunk/pom.xml Mon Jun 14 05:40:03 2010
> > > @@ -39,42 +39,42 @@
> > > <ode.version>1.3.5-SNAPSHOT</ode.version>
> > > <activation.version>1.1</activation.version>
> > > <annogen.version>0.1.0</annogen.version>
> > > - <antlr.version>2.7.7</antlr.version>
> > > - <axiom.version>1.2.7</axiom.version>
> > > - <axis2.version>1.5</axis2.version>
> > > + <antlr.version>2.7.7</antlr.version>
> > > + <axiom.version>1.2.8</axiom.version>
> > > + <axis2.version>1.5.1</axis2.version>
> > > <rampart.version>1.4</rampart.version>
> > > <commons.codec.version>1.3</commons.codec.version>
> > > - <backport.concurrent.version>3.1</backport.concurrent.version>
> > > + <backport.concurrent.version>3.1</backport.concurrent.version>
> > > <commons.fileupload.version>1.2</commons.fileupload.version>
> > >
> <commons.collections.version>3.2.1</commons.collections.version>
> > > <commons.httpclient.version>3.1</commons.httpclient.version>
> > > - <commons.io.version>1.4</commons.io.version>
> > > + <commons.io.version>1.4</commons.io.version>
> > > <commons.lang.version>2.4</commons.lang.version>
> > > <commons.logging.version>1.1</commons.logging.version>
> > > <commons.pool.version>1.4</commons.pool.version>
> > > <commons.primitives.version>1.0</commons.primitives.version>
> > > - <commons.dbcp.version>1.2.1</commons.dbcp.version>
> > > - <httpcomponents.version>4.0-beta1</httpcomponents.version>
> > > - <jaxb-api.version>2.1</jaxb-api.version>
> > > - <jaxb.version>2.1.6</jaxb.version>
> > > - <jaxen.version>1.1.1</jaxen.version>
> > > - <jettison.version>1.0-RC2</jettison.version>
> > > - <jibx.version>1.1.5</jibx.version>
> > > - <neethi.version>2.0.4</neethi.version>
> > > - <woden.version>1.0M8</woden.version>
> > > + <commons.dbcp.version>1.2.1</commons.dbcp.version>
> > > + <httpcomponents.version>4.0</httpcomponents.version>
> > > + <jaxb-api.version>2.1</jaxb-api.version>
> > > + <jaxb.version>2.1.6</jaxb.version>
> > > + <jaxen.version>1.1.1</jaxen.version>
> > > + <jettison.version>1.0-RC2</jettison.version>
> > > + <jibx.version>1.1.5</jibx.version>
> > > + <neethi.version>2.0.4</neethi.version>
> > > + <woden.version>1.0M8</woden.version>
> > > <wsdl4j.version>1.6.2</wsdl4j.version>
> > > - <woodstox.version>3.2.4</woodstox.version>
> > > - <javax.mail.version>1.4</javax.mail.version>
> > > + <woodstox.version>3.2.4</woodstox.version>
> > > + <javax.mail.version>1.4</javax.mail.version>
> > > <hibernate.version>3.2.5.ga</hibernate.version>
> > > - <spring.version>2.5.6</spring.version>
> > > + <spring.version>2.5.6</spring.version>
> > > <geronimo.specs.version>1.0</geronimo.specs.version>
> > > <geronimo.version>2.0.1</geronimo.version>
> > > - <geronimo.activation.version>1.0.1</geronimo.activation.version>
> > > - <geronimo.annotation.version>1.1</geronimo.annotation.version>
> > > - <geronimo.javamail.version>1.2</geronimo.javamail.version>
> > > - <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version>
> > > +
> <geronimo.activation.version>1.0.1</geronimo.activation.version>
> > > + <geronimo.annotation.version>1.1</geronimo.annotation.version>
> > > + <geronimo.javamail.version>1.2</geronimo.javamail.version>
> > > + <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version>
> > > <geronimo.specs.jta.version>1.1</geronimo.specs.jta.version>
> > > - <geronimo.specs.ejb.version>1.1</geronimo.specs.ejb.version>
> > > + <geronimo.specs.ejb.version>1.1</geronimo.specs.ejb.version>
> > > <jetty.version>6.1.12rc1</jetty.version>
> > > <jencks.version>2.1</jencks.version>
> > > <jasper.version>4.2.20RC0</jasper.version>
> > > @@ -87,56 +87,57 @@
> > > <xmlresolver.version>1.2</xmlresolver.version>
> > > <xmlbeans.version>2.3.0</xmlbeans.version>
> > > <xstream.version>1.2</xstream.version>
> > > - <junit.version>4.4</junit.version>
> > > + <junit.version>4.4</junit.version>
> > > <hsqldb.version>1.8.0.7</hsqldb.version>
> > > - <persistence-api.version>1.0</persistence-api.version>
> > > - <xalan.version>2.7.1</xalan.version>
> > > + <persistence-api.version>1.0</persistence-api.version>
> > > + <xalan.version>2.7.1</xalan.version>
> > > <ant.version>1.6.5</ant.version>
> > > - <openjpa.version>1.2.1</openjpa.version>
> > > + <openjpa.version>1.2.1</openjpa.version>
> > > <serp.version>1.13.1</serp.version>
> > > - <dom4j.version>1.6.1</dom4j.version>
> > > + <dom4j.version>1.6.1</dom4j.version>
> > > <derby.version>10.5.3.0_1</derby.version>
> > > <jmock.version>1.2.0</jmock.version>
> > > <xml.parser.version>2.6.2</xml.parser.version>
> > > <activemq.version>4.1.1</activemq.version>
> > > <xml-apis.version>1.3.04</xml-apis.version>
> > > <servicemix.nmr.version>1.1.0-SNAPSHOT</servicemix.nmr.version>
> > > + <axis2.transport.version>1.0.0</axis2.transport.version>
> > > </properties>
> > >
> > >
> > > <modules>
> > > - <module>agents</module>
> > > - <module>utils</module>
> > > - <module>jacob-ap</module>
> > > - <module>jacob</module>
> > > - <module>bpel-schemas</module>
> > > - <module>bpel-scripts</module>
> > > - <module>bpel-api</module>
> > > - <module>bpel-api-jca</module>
> > > - <module>bpel-dao</module>
> > > - <module>bpel-obj</module>
> > > - <module>dao-jpa</module>
> > > - <module>jca-ra</module>
> > > - <module>jca-server</module>
> > > - <module>scheduler-simple</module>
> > > - <module>bpel-compiler</module>
> > > - <module>bpel-epr</module>
> > > - <module>bpel-ql</module>
> > > - <module>dao-hibernate</module>
> > > - <module>tools</module>
> > > - <module>bpel-store</module>
> > > - <module>dao-jpa-ojpa-derby</module>
> > > - <module>dao-hibernate-db</module>
> > > - <module>bpel-runtime</module>
> > > - <module>bpel-connector</module>
> > > - <module>bpel-test</module>
> > > - <module>axis2</module>
> > > - <module>jbi</module>
> > > - <module>jbi-bundle</module>
> > > - <module>jbi-karaf</module>
> > > - <module>distro/src/examples-jbi/maven2/ping-pong-osgi</module>
> > > - <module>axis2-war</module>
> > > - <module>distro</module>
> > > + <module>agents</module>
> > > + <module>utils</module>
> > > + <module>jacob-ap</module>
> > > + <module>jacob</module>
> > > + <module>bpel-schemas</module>
> > > + <module>bpel-scripts</module>
> > > + <module>bpel-api</module>
> > > + <module>bpel-api-jca</module>
> > > + <module>bpel-dao</module>
> > > + <module>bpel-obj</module>
> > > + <module>dao-jpa</module>
> > > + <module>jca-ra</module>
> > > + <module>jca-server</module>
> > > + <module>scheduler-simple</module>
> > > + <module>bpel-compiler</module>
> > > + <module>bpel-epr</module>
> > > + <module>bpel-ql</module>
> > > + <module>dao-hibernate</module>
> > > + <module>tools</module>
> > > + <module>bpel-store</module>
> > > + <module>dao-jpa-ojpa-derby</module>
> > > + <module>dao-hibernate-db</module>
> > > + <module>bpel-runtime</module>
> > > + <module>bpel-connector</module>
> > > + <!--module>bpel-test</module-->
> > > + <module>axis2</module>
> > > + <module>jbi</module>
> > > + <module>jbi-bundle</module>
> > > + <module>jbi-karaf</module>
> > > + <module>distro/src/examples-jbi/maven2/ping-pong-osgi</module>
> > > + <module>axis2-war</module>
> > > + <module>distro</module>
> > > </modules>
> > >
> > > <build>
> > > @@ -151,7 +152,7 @@
> > > <plugin>
> > > <groupId>org.apache.maven.plugins</groupId>
> > > <artifactId>maven-compiler-plugin</artifactId>
> > > - <version>2.0.2</version>
> > > + <version>2.0.2</version>
> > > <configuration>
> > > <source>1.5</source>
> > > <target>1.5</target>
> > > @@ -175,11 +176,11 @@
> > > <artifactId>xdoclet-maven-plugin</artifactId>
> > > <version>1.0</version>
> > > <dependencies>
> > > - <dependency>
> > > - <groupId>xdoclet</groupId>
> > > - <artifactId>xjavadoc</artifactId>
> > > - <version>1.1-j5</version>
> > > - </dependency>
> > > + <dependency>
> > > + <groupId>xdoclet</groupId>
> > > + <artifactId>xjavadoc</artifactId>
> > > + <version>1.1-j5</version>
> > > + </dependency>
> > > </dependencies>
> > > </plugin>
> > >
> > > @@ -189,23 +190,23 @@
> > > <version>${xmlbeans.version}</version>
> > > </plugin>
> > >
> > > - <plugin>
> > > - <groupId>org.codehaus.mojo</groupId>
> > > - <artifactId>sql-maven-plugin</artifactId>
> > > - <version>1.2</version>
> > > - <dependencies>
> > > - <dependency>
> > > - <groupId>org.apache.derby</groupId>
> > > - <artifactId>derby</artifactId>
> > > - <version>${derby.version}</version>
> > > - </dependency>
> > > - <dependency>
> > > - <groupId>org.apache.derby</groupId>
> > > - <artifactId>derbytools</artifactId>
> > > - <version>${derby.version}</version>
> > > - </dependency>
> > > - </dependencies>
> > > - </plugin>
> > > + <plugin>
> > > + <groupId>org.codehaus.mojo</groupId>
> > > + <artifactId>sql-maven-plugin</artifactId>
> > > + <version>1.2</version>
> > > + <dependencies>
> > > + <dependency>
> > > + <groupId>org.apache.derby</groupId>
> > > + <artifactId>derby</artifactId>
> > > + <version>${derby.version}</version>
> > > + </dependency>
> > > + <dependency>
> > > + <groupId>org.apache.derby</groupId>
> > > + <artifactId>derbytools</artifactId>
> > > + <version>${derby.version}</version>
> > > + </dependency>
> > > + </dependencies>
> > > + </plugin>
> > >
> > > <!-- Allows direct usage of the javadoc:javadoc goal.
> -->
> > > <plugin>
> > > @@ -222,49 +223,53 @@
> > > </build>
> > >
> > >
> > > -
> > > <!--|
> > > | List of repositories for all the various dependencies,
> > > | and Maven plugins.
> > > |
> > > -->
> > > - <repositories>
> > > - <repository>
> > > - <id>servicemix-repo</id>
> > > - <name>ServiceMix Repository</name>
> > > - <url>https://repository.apache.org/content/groups/public</url>
> > > - <releases>
> > > - <enabled>true</enabled>
> > > - </releases>
> > > - <snapshots>
> > > - <enabled>false</enabled>
> > > - </snapshots>
> > > - </repository>
> > > - <!--
> > > - <repository>
> > > - <id>servicemix</id>
> > > - <name>Apache ServiceMix Repository</name>
> > > - <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
> > > - <releases>
> > > - <enabled>true</enabled>
> > > - </releases>
> > > - <snapshots>
> > > - <enabled>false</enabled>
> > > - </snapshots>
> > > - </repository>
> > > - -->
> > > - <repository>
> > > - <id>saxon-repo</id>
> > > - <name>Saxon Repo</name>
> > > - <url>http://people.apache.org/~rr/saxon-repo<http://people.apache.org/%7Err/saxon-repo>
> <
> > http://people.apache.org/%7Err/saxon-repo>
> > > </url>
> > > - <releases>
> > > - <enabled>true</enabled>
> > > - </releases>
> > > - <snapshots>
> > > - <enabled>false</enabled>
> > > - </snapshots>
> > > - </repository>
> > > - </repositories>
> > > + <repositories>
> > > + <repository>
> > > + <id>servicemix-repo</id>
> > > + <name>ServiceMix Repository</name>
> > > + <url>https://repository.apache.org/content/groups/public
> > > </url>
> > > + <releases>
> > > + <enabled>true</enabled>
> > > + </releases>
> > > + <snapshots>
> > > + <enabled>false</enabled>
> > > + </snapshots>
> > > + </repository>
> > > + <!--
> > > + <repository>
> > > + <id>servicemix</id>
> > > + <name>Apache ServiceMix Repository</name>
> > > + <url>http://svn.apache.org/repos/asf/servicemix/m2-repo
> </url>
> > > + <releases>
> > > + <enabled>true</enabled>
> > > + </releases>
> > > + <snapshots>
> > > + <enabled>false</enabled>
> > > + </snapshots>
> > > + </repository>
> > > + -->
> > > + <repository>
> > > + <id>saxon-repo</id>
> > > + <name>Saxon Repo</name>
> > > + <url>http://people.apache.org/~rr/saxon-repo<http://people.apache.org/%7Err/saxon-repo>
> <
> > http://people.apache.org/%7Err/saxon-repo>
> > > </url>
> > > + <releases>
> > > + <enabled>true</enabled>
> > > + </releases>
> > > + <snapshots>
> > > + <enabled>false</enabled>
> > > + </snapshots>
> > > + </repository>
> > > + <repository>
> > > + <id>central</id>
> > > + <name>Apache Maven Repo</name>
> > > + <url>http://repo1.maven.org/maven2/</url>
> > > + </repository>
> > > + </repositories>
> > >
> > > <!--
> > > <repositories>
> > > @@ -505,7 +510,7 @@
> > > <artifactId>axiom-impl</artifactId>
> > > <version>${axiom.version}</version>
> > > </dependency>
> > > - <dependency>
> > > + <dependency>
> > > <groupId>org.apache.ws.commons.axiom</groupId>
> > > <artifactId>axiom-dom</artifactId>
> > > <version>${axiom.version}</version>
> > > @@ -555,11 +560,11 @@
> > > <artifactId>commons-dbcp</artifactId>
> > > <version>${commons.dbcp.version}</version>
> > > </dependency>
> > > - <dependency>
> > > - <groupId>commons-primitives</groupId>
> > > - <artifactId>commons-primitives</artifactId>
> > > - <version>${commons.primitives.version}</version>
> > > - </dependency>
> > > + <dependency>
> > > + <groupId>commons-primitives</groupId>
> > > + <artifactId>commons-primitives</artifactId>
> > > + <version>${commons.primitives.version}</version>
> > > + </dependency>
> > > <dependency>
> > > <groupId>org.apache.geronimo.specs</groupId>
> > > <artifactId>geronimo-jta_1.1_spec</artifactId>
> > > @@ -697,26 +702,26 @@
> > > <artifactId>mail</artifactId>
> > > <version>${javax.mail.version}</version>
> > > </dependency>
> > > - <dependency>
> > > - <groupId>org.apache.openjpa</groupId>
> > > - <artifactId>openjpa</artifactId>
> > > - <version>${openjpa.version}</version>
> > > - </dependency>
> > > - <dependency>
> > > - <groupId>net.sourceforge.serp</groupId>
> > > - <artifactId>serp</artifactId>
> > > - <version>${serp.version}</version>
> > > - </dependency>
> > > - <dependency>
> > > - <groupId>dom4j</groupId>
> > > - <artifactId>dom4j</artifactId>
> > > - <version>${dom4j.version}</version>
> > > - </dependency>
> > > - <dependency>
> > > - <groupId>xml-apis</groupId>
> > > - <artifactId>xml-apis</artifactId>
> > > - <version>${xml-apis.version}</version>
> > > - </dependency>
> > > + <dependency>
> > > + <groupId>org.apache.openjpa</groupId>
> > > + <artifactId>openjpa</artifactId>
> > > + <version>${openjpa.version}</version>
> > > + </dependency>
> > > + <dependency>
> > > + <groupId>net.sourceforge.serp</groupId>
> > > + <artifactId>serp</artifactId>
> > > + <version>${serp.version}</version>
> > > + </dependency>
> > > + <dependency>
> > > + <groupId>dom4j</groupId>
> > > + <artifactId>dom4j</artifactId>
> > > + <version>${dom4j.version}</version>
> > > + </dependency>
> > > + <dependency>
> > > + <groupId>xml-apis</groupId>
> > > + <artifactId>xml-apis</artifactId>
> > > + <version>${xml-apis.version}</version>
> > > + </dependency>
> > > <dependency>
> > > <groupId>commons-pool</groupId>
> > > <artifactId>commons-pool</artifactId>
> > > @@ -918,6 +923,11 @@
> > > <version>${axis2.version}</version>
> > > </dependency>
> > > <dependency>
> > > + <groupId>org.apache.axis2</groupId>
> > > + <artifactId>axis2-transport-jms</artifactId>
> > > + <version>${axis2.transport.version}</version>
> > > + </dependency>
> > > + <dependency>
> > > <groupId>org.slf4j</groupId>
> > > <artifactId>slf4j-api</artifactId>
> > > <version>${slf4j.version}</version>
> > >
> >
> >
> > --
> > Cheers,
> > Jeff Yu
> >
> > ----------------
> > blog: http://jeff.familyyu.net
> >
>
>
>
> --
> Milinda Pathirage
> Technical Lead & Product Manager WSO2 BPS; http://wso2.org/bps
> WSO2 Inc.; http://wso2.com
> E-mail: milinda@wso2.com, milinda.pathirage@gmail.com
> Web: http://mpathirage.com
> Blog: http://blog.mpathirage.com
>
--
Cheers,
Jeff Yu
----------------
blog: http://jeff.familyyu.net
Re: svn commit: r954370 - in /ode/trunk: axis2-war/pom.xml
axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml axis2/pom.xml
distro/src/main/assembly/war.xml pom.xml utils/pom.xml
Posted by Milinda Pathirage <mi...@gmail.com>.
Hi Jeff,
Forgot to update it. Sorry for the inconvenience caused.
thanks
Milinda
On Tue, Jun 29, 2010 at 6:19 PM, Jeff Yu <je...@gmail.com> wrote:
> Hi Milinda,
>
> Any reasons that why we commented out the bpel-test module in maven build?
> or forgot to update?
>
> Regards
> Jeff
>
> On Mon, Jun 14, 2010 at 3:40 PM, <mi...@apache.org> wrote:
>
> > Author: milinda
> > Date: Mon Jun 14 05:40:03 2010
> > New Revision: 954370
> >
> > URL: http://svn.apache.org/viewvc?rev=954370&view=rev
> > Log:
> > Fix for ODE WAR distribution's build issues. There is a issue in
> > InstanceManagementDeployment. Will fix it separately.
> >
> > Modified:
> > ode/trunk/pom.xml
> >
> >
> > Modified: ode/trunk/pom.xml
> > URL:
> >
> http://svn.apache.org/viewvc/ode/trunk/pom.xml?rev=954370&r1=954369&r2=954370&view=diff
> >
> >
> ==============================================================================
> > --- ode/trunk/pom.xml (original)
> > +++ ode/trunk/pom.xml Mon Jun 14 05:40:03 2010
> > @@ -39,42 +39,42 @@
> > <ode.version>1.3.5-SNAPSHOT</ode.version>
> > <activation.version>1.1</activation.version>
> > <annogen.version>0.1.0</annogen.version>
> > - <antlr.version>2.7.7</antlr.version>
> > - <axiom.version>1.2.7</axiom.version>
> > - <axis2.version>1.5</axis2.version>
> > + <antlr.version>2.7.7</antlr.version>
> > + <axiom.version>1.2.8</axiom.version>
> > + <axis2.version>1.5.1</axis2.version>
> > <rampart.version>1.4</rampart.version>
> > <commons.codec.version>1.3</commons.codec.version>
> > - <backport.concurrent.version>3.1</backport.concurrent.version>
> > + <backport.concurrent.version>3.1</backport.concurrent.version>
> > <commons.fileupload.version>1.2</commons.fileupload.version>
> > <commons.collections.version>3.2.1</commons.collections.version>
> > <commons.httpclient.version>3.1</commons.httpclient.version>
> > - <commons.io.version>1.4</commons.io.version>
> > + <commons.io.version>1.4</commons.io.version>
> > <commons.lang.version>2.4</commons.lang.version>
> > <commons.logging.version>1.1</commons.logging.version>
> > <commons.pool.version>1.4</commons.pool.version>
> > <commons.primitives.version>1.0</commons.primitives.version>
> > - <commons.dbcp.version>1.2.1</commons.dbcp.version>
> > - <httpcomponents.version>4.0-beta1</httpcomponents.version>
> > - <jaxb-api.version>2.1</jaxb-api.version>
> > - <jaxb.version>2.1.6</jaxb.version>
> > - <jaxen.version>1.1.1</jaxen.version>
> > - <jettison.version>1.0-RC2</jettison.version>
> > - <jibx.version>1.1.5</jibx.version>
> > - <neethi.version>2.0.4</neethi.version>
> > - <woden.version>1.0M8</woden.version>
> > + <commons.dbcp.version>1.2.1</commons.dbcp.version>
> > + <httpcomponents.version>4.0</httpcomponents.version>
> > + <jaxb-api.version>2.1</jaxb-api.version>
> > + <jaxb.version>2.1.6</jaxb.version>
> > + <jaxen.version>1.1.1</jaxen.version>
> > + <jettison.version>1.0-RC2</jettison.version>
> > + <jibx.version>1.1.5</jibx.version>
> > + <neethi.version>2.0.4</neethi.version>
> > + <woden.version>1.0M8</woden.version>
> > <wsdl4j.version>1.6.2</wsdl4j.version>
> > - <woodstox.version>3.2.4</woodstox.version>
> > - <javax.mail.version>1.4</javax.mail.version>
> > + <woodstox.version>3.2.4</woodstox.version>
> > + <javax.mail.version>1.4</javax.mail.version>
> > <hibernate.version>3.2.5.ga</hibernate.version>
> > - <spring.version>2.5.6</spring.version>
> > + <spring.version>2.5.6</spring.version>
> > <geronimo.specs.version>1.0</geronimo.specs.version>
> > <geronimo.version>2.0.1</geronimo.version>
> > - <geronimo.activation.version>1.0.1</geronimo.activation.version>
> > - <geronimo.annotation.version>1.1</geronimo.annotation.version>
> > - <geronimo.javamail.version>1.2</geronimo.javamail.version>
> > - <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version>
> > + <geronimo.activation.version>1.0.1</geronimo.activation.version>
> > + <geronimo.annotation.version>1.1</geronimo.annotation.version>
> > + <geronimo.javamail.version>1.2</geronimo.javamail.version>
> > + <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version>
> > <geronimo.specs.jta.version>1.1</geronimo.specs.jta.version>
> > - <geronimo.specs.ejb.version>1.1</geronimo.specs.ejb.version>
> > + <geronimo.specs.ejb.version>1.1</geronimo.specs.ejb.version>
> > <jetty.version>6.1.12rc1</jetty.version>
> > <jencks.version>2.1</jencks.version>
> > <jasper.version>4.2.20RC0</jasper.version>
> > @@ -87,56 +87,57 @@
> > <xmlresolver.version>1.2</xmlresolver.version>
> > <xmlbeans.version>2.3.0</xmlbeans.version>
> > <xstream.version>1.2</xstream.version>
> > - <junit.version>4.4</junit.version>
> > + <junit.version>4.4</junit.version>
> > <hsqldb.version>1.8.0.7</hsqldb.version>
> > - <persistence-api.version>1.0</persistence-api.version>
> > - <xalan.version>2.7.1</xalan.version>
> > + <persistence-api.version>1.0</persistence-api.version>
> > + <xalan.version>2.7.1</xalan.version>
> > <ant.version>1.6.5</ant.version>
> > - <openjpa.version>1.2.1</openjpa.version>
> > + <openjpa.version>1.2.1</openjpa.version>
> > <serp.version>1.13.1</serp.version>
> > - <dom4j.version>1.6.1</dom4j.version>
> > + <dom4j.version>1.6.1</dom4j.version>
> > <derby.version>10.5.3.0_1</derby.version>
> > <jmock.version>1.2.0</jmock.version>
> > <xml.parser.version>2.6.2</xml.parser.version>
> > <activemq.version>4.1.1</activemq.version>
> > <xml-apis.version>1.3.04</xml-apis.version>
> > <servicemix.nmr.version>1.1.0-SNAPSHOT</servicemix.nmr.version>
> > + <axis2.transport.version>1.0.0</axis2.transport.version>
> > </properties>
> >
> >
> > <modules>
> > - <module>agents</module>
> > - <module>utils</module>
> > - <module>jacob-ap</module>
> > - <module>jacob</module>
> > - <module>bpel-schemas</module>
> > - <module>bpel-scripts</module>
> > - <module>bpel-api</module>
> > - <module>bpel-api-jca</module>
> > - <module>bpel-dao</module>
> > - <module>bpel-obj</module>
> > - <module>dao-jpa</module>
> > - <module>jca-ra</module>
> > - <module>jca-server</module>
> > - <module>scheduler-simple</module>
> > - <module>bpel-compiler</module>
> > - <module>bpel-epr</module>
> > - <module>bpel-ql</module>
> > - <module>dao-hibernate</module>
> > - <module>tools</module>
> > - <module>bpel-store</module>
> > - <module>dao-jpa-ojpa-derby</module>
> > - <module>dao-hibernate-db</module>
> > - <module>bpel-runtime</module>
> > - <module>bpel-connector</module>
> > - <module>bpel-test</module>
> > - <module>axis2</module>
> > - <module>jbi</module>
> > - <module>jbi-bundle</module>
> > - <module>jbi-karaf</module>
> > - <module>distro/src/examples-jbi/maven2/ping-pong-osgi</module>
> > - <module>axis2-war</module>
> > - <module>distro</module>
> > + <module>agents</module>
> > + <module>utils</module>
> > + <module>jacob-ap</module>
> > + <module>jacob</module>
> > + <module>bpel-schemas</module>
> > + <module>bpel-scripts</module>
> > + <module>bpel-api</module>
> > + <module>bpel-api-jca</module>
> > + <module>bpel-dao</module>
> > + <module>bpel-obj</module>
> > + <module>dao-jpa</module>
> > + <module>jca-ra</module>
> > + <module>jca-server</module>
> > + <module>scheduler-simple</module>
> > + <module>bpel-compiler</module>
> > + <module>bpel-epr</module>
> > + <module>bpel-ql</module>
> > + <module>dao-hibernate</module>
> > + <module>tools</module>
> > + <module>bpel-store</module>
> > + <module>dao-jpa-ojpa-derby</module>
> > + <module>dao-hibernate-db</module>
> > + <module>bpel-runtime</module>
> > + <module>bpel-connector</module>
> > + <!--module>bpel-test</module-->
> > + <module>axis2</module>
> > + <module>jbi</module>
> > + <module>jbi-bundle</module>
> > + <module>jbi-karaf</module>
> > + <module>distro/src/examples-jbi/maven2/ping-pong-osgi</module>
> > + <module>axis2-war</module>
> > + <module>distro</module>
> > </modules>
> >
> > <build>
> > @@ -151,7 +152,7 @@
> > <plugin>
> > <groupId>org.apache.maven.plugins</groupId>
> > <artifactId>maven-compiler-plugin</artifactId>
> > - <version>2.0.2</version>
> > + <version>2.0.2</version>
> > <configuration>
> > <source>1.5</source>
> > <target>1.5</target>
> > @@ -175,11 +176,11 @@
> > <artifactId>xdoclet-maven-plugin</artifactId>
> > <version>1.0</version>
> > <dependencies>
> > - <dependency>
> > - <groupId>xdoclet</groupId>
> > - <artifactId>xjavadoc</artifactId>
> > - <version>1.1-j5</version>
> > - </dependency>
> > + <dependency>
> > + <groupId>xdoclet</groupId>
> > + <artifactId>xjavadoc</artifactId>
> > + <version>1.1-j5</version>
> > + </dependency>
> > </dependencies>
> > </plugin>
> >
> > @@ -189,23 +190,23 @@
> > <version>${xmlbeans.version}</version>
> > </plugin>
> >
> > - <plugin>
> > - <groupId>org.codehaus.mojo</groupId>
> > - <artifactId>sql-maven-plugin</artifactId>
> > - <version>1.2</version>
> > - <dependencies>
> > - <dependency>
> > - <groupId>org.apache.derby</groupId>
> > - <artifactId>derby</artifactId>
> > - <version>${derby.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>org.apache.derby</groupId>
> > - <artifactId>derbytools</artifactId>
> > - <version>${derby.version}</version>
> > - </dependency>
> > - </dependencies>
> > - </plugin>
> > + <plugin>
> > + <groupId>org.codehaus.mojo</groupId>
> > + <artifactId>sql-maven-plugin</artifactId>
> > + <version>1.2</version>
> > + <dependencies>
> > + <dependency>
> > + <groupId>org.apache.derby</groupId>
> > + <artifactId>derby</artifactId>
> > + <version>${derby.version}</version>
> > + </dependency>
> > + <dependency>
> > + <groupId>org.apache.derby</groupId>
> > + <artifactId>derbytools</artifactId>
> > + <version>${derby.version}</version>
> > + </dependency>
> > + </dependencies>
> > + </plugin>
> >
> > <!-- Allows direct usage of the javadoc:javadoc goal. -->
> > <plugin>
> > @@ -222,49 +223,53 @@
> > </build>
> >
> >
> > -
> > <!--|
> > | List of repositories for all the various dependencies,
> > | and Maven plugins.
> > |
> > -->
> > - <repositories>
> > - <repository>
> > - <id>servicemix-repo</id>
> > - <name>ServiceMix Repository</name>
> > - <url>https://repository.apache.org/content/groups/public</url>
> > - <releases>
> > - <enabled>true</enabled>
> > - </releases>
> > - <snapshots>
> > - <enabled>false</enabled>
> > - </snapshots>
> > - </repository>
> > - <!--
> > - <repository>
> > - <id>servicemix</id>
> > - <name>Apache ServiceMix Repository</name>
> > - <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
> > - <releases>
> > - <enabled>true</enabled>
> > - </releases>
> > - <snapshots>
> > - <enabled>false</enabled>
> > - </snapshots>
> > - </repository>
> > - -->
> > - <repository>
> > - <id>saxon-repo</id>
> > - <name>Saxon Repo</name>
> > - <url>http://people.apache.org/~rr/saxon-repo<
> http://people.apache.org/%7Err/saxon-repo>
> > </url>
> > - <releases>
> > - <enabled>true</enabled>
> > - </releases>
> > - <snapshots>
> > - <enabled>false</enabled>
> > - </snapshots>
> > - </repository>
> > - </repositories>
> > + <repositories>
> > + <repository>
> > + <id>servicemix-repo</id>
> > + <name>ServiceMix Repository</name>
> > + <url>https://repository.apache.org/content/groups/public
> > </url>
> > + <releases>
> > + <enabled>true</enabled>
> > + </releases>
> > + <snapshots>
> > + <enabled>false</enabled>
> > + </snapshots>
> > + </repository>
> > + <!--
> > + <repository>
> > + <id>servicemix</id>
> > + <name>Apache ServiceMix Repository</name>
> > + <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
> > + <releases>
> > + <enabled>true</enabled>
> > + </releases>
> > + <snapshots>
> > + <enabled>false</enabled>
> > + </snapshots>
> > + </repository>
> > + -->
> > + <repository>
> > + <id>saxon-repo</id>
> > + <name>Saxon Repo</name>
> > + <url>http://people.apache.org/~rr/saxon-repo<
> http://people.apache.org/%7Err/saxon-repo>
> > </url>
> > + <releases>
> > + <enabled>true</enabled>
> > + </releases>
> > + <snapshots>
> > + <enabled>false</enabled>
> > + </snapshots>
> > + </repository>
> > + <repository>
> > + <id>central</id>
> > + <name>Apache Maven Repo</name>
> > + <url>http://repo1.maven.org/maven2/</url>
> > + </repository>
> > + </repositories>
> >
> > <!--
> > <repositories>
> > @@ -505,7 +510,7 @@
> > <artifactId>axiom-impl</artifactId>
> > <version>${axiom.version}</version>
> > </dependency>
> > - <dependency>
> > + <dependency>
> > <groupId>org.apache.ws.commons.axiom</groupId>
> > <artifactId>axiom-dom</artifactId>
> > <version>${axiom.version}</version>
> > @@ -555,11 +560,11 @@
> > <artifactId>commons-dbcp</artifactId>
> > <version>${commons.dbcp.version}</version>
> > </dependency>
> > - <dependency>
> > - <groupId>commons-primitives</groupId>
> > - <artifactId>commons-primitives</artifactId>
> > - <version>${commons.primitives.version}</version>
> > - </dependency>
> > + <dependency>
> > + <groupId>commons-primitives</groupId>
> > + <artifactId>commons-primitives</artifactId>
> > + <version>${commons.primitives.version}</version>
> > + </dependency>
> > <dependency>
> > <groupId>org.apache.geronimo.specs</groupId>
> > <artifactId>geronimo-jta_1.1_spec</artifactId>
> > @@ -697,26 +702,26 @@
> > <artifactId>mail</artifactId>
> > <version>${javax.mail.version}</version>
> > </dependency>
> > - <dependency>
> > - <groupId>org.apache.openjpa</groupId>
> > - <artifactId>openjpa</artifactId>
> > - <version>${openjpa.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>net.sourceforge.serp</groupId>
> > - <artifactId>serp</artifactId>
> > - <version>${serp.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>dom4j</groupId>
> > - <artifactId>dom4j</artifactId>
> > - <version>${dom4j.version}</version>
> > - </dependency>
> > - <dependency>
> > - <groupId>xml-apis</groupId>
> > - <artifactId>xml-apis</artifactId>
> > - <version>${xml-apis.version}</version>
> > - </dependency>
> > + <dependency>
> > + <groupId>org.apache.openjpa</groupId>
> > + <artifactId>openjpa</artifactId>
> > + <version>${openjpa.version}</version>
> > + </dependency>
> > + <dependency>
> > + <groupId>net.sourceforge.serp</groupId>
> > + <artifactId>serp</artifactId>
> > + <version>${serp.version}</version>
> > + </dependency>
> > + <dependency>
> > + <groupId>dom4j</groupId>
> > + <artifactId>dom4j</artifactId>
> > + <version>${dom4j.version}</version>
> > + </dependency>
> > + <dependency>
> > + <groupId>xml-apis</groupId>
> > + <artifactId>xml-apis</artifactId>
> > + <version>${xml-apis.version}</version>
> > + </dependency>
> > <dependency>
> > <groupId>commons-pool</groupId>
> > <artifactId>commons-pool</artifactId>
> > @@ -918,6 +923,11 @@
> > <version>${axis2.version}</version>
> > </dependency>
> > <dependency>
> > + <groupId>org.apache.axis2</groupId>
> > + <artifactId>axis2-transport-jms</artifactId>
> > + <version>${axis2.transport.version}</version>
> > + </dependency>
> > + <dependency>
> > <groupId>org.slf4j</groupId>
> > <artifactId>slf4j-api</artifactId>
> > <version>${slf4j.version}</version>
> >
>
>
> --
> Cheers,
> Jeff Yu
>
> ----------------
> blog: http://jeff.familyyu.net
>
--
Milinda Pathirage
Technical Lead & Product Manager WSO2 BPS; http://wso2.org/bps
WSO2 Inc.; http://wso2.com
E-mail: milinda@wso2.com, milinda.pathirage@gmail.com
Web: http://mpathirage.com
Blog: http://blog.mpathirage.com
Re: svn commit: r954370 - in /ode/trunk: axis2-war/pom.xml
axis2-war/src/main/webapp/WEB-INF/conf/axis2.xml axis2/pom.xml
distro/src/main/assembly/war.xml pom.xml utils/pom.xml
Posted by Jeff Yu <je...@gmail.com>.
Hi Milinda,
Any reasons that why we commented out the bpel-test module in maven build?
or forgot to update?
Regards
Jeff
On Mon, Jun 14, 2010 at 3:40 PM, <mi...@apache.org> wrote:
> Author: milinda
> Date: Mon Jun 14 05:40:03 2010
> New Revision: 954370
>
> URL: http://svn.apache.org/viewvc?rev=954370&view=rev
> Log:
> Fix for ODE WAR distribution's build issues. There is a issue in
> InstanceManagementDeployment. Will fix it separately.
>
> Modified:
> ode/trunk/pom.xml
>
>
> Modified: ode/trunk/pom.xml
> URL:
> http://svn.apache.org/viewvc/ode/trunk/pom.xml?rev=954370&r1=954369&r2=954370&view=diff
>
> ==============================================================================
> --- ode/trunk/pom.xml (original)
> +++ ode/trunk/pom.xml Mon Jun 14 05:40:03 2010
> @@ -39,42 +39,42 @@
> <ode.version>1.3.5-SNAPSHOT</ode.version>
> <activation.version>1.1</activation.version>
> <annogen.version>0.1.0</annogen.version>
> - <antlr.version>2.7.7</antlr.version>
> - <axiom.version>1.2.7</axiom.version>
> - <axis2.version>1.5</axis2.version>
> + <antlr.version>2.7.7</antlr.version>
> + <axiom.version>1.2.8</axiom.version>
> + <axis2.version>1.5.1</axis2.version>
> <rampart.version>1.4</rampart.version>
> <commons.codec.version>1.3</commons.codec.version>
> - <backport.concurrent.version>3.1</backport.concurrent.version>
> + <backport.concurrent.version>3.1</backport.concurrent.version>
> <commons.fileupload.version>1.2</commons.fileupload.version>
> <commons.collections.version>3.2.1</commons.collections.version>
> <commons.httpclient.version>3.1</commons.httpclient.version>
> - <commons.io.version>1.4</commons.io.version>
> + <commons.io.version>1.4</commons.io.version>
> <commons.lang.version>2.4</commons.lang.version>
> <commons.logging.version>1.1</commons.logging.version>
> <commons.pool.version>1.4</commons.pool.version>
> <commons.primitives.version>1.0</commons.primitives.version>
> - <commons.dbcp.version>1.2.1</commons.dbcp.version>
> - <httpcomponents.version>4.0-beta1</httpcomponents.version>
> - <jaxb-api.version>2.1</jaxb-api.version>
> - <jaxb.version>2.1.6</jaxb.version>
> - <jaxen.version>1.1.1</jaxen.version>
> - <jettison.version>1.0-RC2</jettison.version>
> - <jibx.version>1.1.5</jibx.version>
> - <neethi.version>2.0.4</neethi.version>
> - <woden.version>1.0M8</woden.version>
> + <commons.dbcp.version>1.2.1</commons.dbcp.version>
> + <httpcomponents.version>4.0</httpcomponents.version>
> + <jaxb-api.version>2.1</jaxb-api.version>
> + <jaxb.version>2.1.6</jaxb.version>
> + <jaxen.version>1.1.1</jaxen.version>
> + <jettison.version>1.0-RC2</jettison.version>
> + <jibx.version>1.1.5</jibx.version>
> + <neethi.version>2.0.4</neethi.version>
> + <woden.version>1.0M8</woden.version>
> <wsdl4j.version>1.6.2</wsdl4j.version>
> - <woodstox.version>3.2.4</woodstox.version>
> - <javax.mail.version>1.4</javax.mail.version>
> + <woodstox.version>3.2.4</woodstox.version>
> + <javax.mail.version>1.4</javax.mail.version>
> <hibernate.version>3.2.5.ga</hibernate.version>
> - <spring.version>2.5.6</spring.version>
> + <spring.version>2.5.6</spring.version>
> <geronimo.specs.version>1.0</geronimo.specs.version>
> <geronimo.version>2.0.1</geronimo.version>
> - <geronimo.activation.version>1.0.1</geronimo.activation.version>
> - <geronimo.annotation.version>1.1</geronimo.annotation.version>
> - <geronimo.javamail.version>1.2</geronimo.javamail.version>
> - <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version>
> + <geronimo.activation.version>1.0.1</geronimo.activation.version>
> + <geronimo.annotation.version>1.1</geronimo.annotation.version>
> + <geronimo.javamail.version>1.2</geronimo.javamail.version>
> + <geronimo.stax-api.version>1.0.1</geronimo.stax-api.version>
> <geronimo.specs.jta.version>1.1</geronimo.specs.jta.version>
> - <geronimo.specs.ejb.version>1.1</geronimo.specs.ejb.version>
> + <geronimo.specs.ejb.version>1.1</geronimo.specs.ejb.version>
> <jetty.version>6.1.12rc1</jetty.version>
> <jencks.version>2.1</jencks.version>
> <jasper.version>4.2.20RC0</jasper.version>
> @@ -87,56 +87,57 @@
> <xmlresolver.version>1.2</xmlresolver.version>
> <xmlbeans.version>2.3.0</xmlbeans.version>
> <xstream.version>1.2</xstream.version>
> - <junit.version>4.4</junit.version>
> + <junit.version>4.4</junit.version>
> <hsqldb.version>1.8.0.7</hsqldb.version>
> - <persistence-api.version>1.0</persistence-api.version>
> - <xalan.version>2.7.1</xalan.version>
> + <persistence-api.version>1.0</persistence-api.version>
> + <xalan.version>2.7.1</xalan.version>
> <ant.version>1.6.5</ant.version>
> - <openjpa.version>1.2.1</openjpa.version>
> + <openjpa.version>1.2.1</openjpa.version>
> <serp.version>1.13.1</serp.version>
> - <dom4j.version>1.6.1</dom4j.version>
> + <dom4j.version>1.6.1</dom4j.version>
> <derby.version>10.5.3.0_1</derby.version>
> <jmock.version>1.2.0</jmock.version>
> <xml.parser.version>2.6.2</xml.parser.version>
> <activemq.version>4.1.1</activemq.version>
> <xml-apis.version>1.3.04</xml-apis.version>
> <servicemix.nmr.version>1.1.0-SNAPSHOT</servicemix.nmr.version>
> + <axis2.transport.version>1.0.0</axis2.transport.version>
> </properties>
>
>
> <modules>
> - <module>agents</module>
> - <module>utils</module>
> - <module>jacob-ap</module>
> - <module>jacob</module>
> - <module>bpel-schemas</module>
> - <module>bpel-scripts</module>
> - <module>bpel-api</module>
> - <module>bpel-api-jca</module>
> - <module>bpel-dao</module>
> - <module>bpel-obj</module>
> - <module>dao-jpa</module>
> - <module>jca-ra</module>
> - <module>jca-server</module>
> - <module>scheduler-simple</module>
> - <module>bpel-compiler</module>
> - <module>bpel-epr</module>
> - <module>bpel-ql</module>
> - <module>dao-hibernate</module>
> - <module>tools</module>
> - <module>bpel-store</module>
> - <module>dao-jpa-ojpa-derby</module>
> - <module>dao-hibernate-db</module>
> - <module>bpel-runtime</module>
> - <module>bpel-connector</module>
> - <module>bpel-test</module>
> - <module>axis2</module>
> - <module>jbi</module>
> - <module>jbi-bundle</module>
> - <module>jbi-karaf</module>
> - <module>distro/src/examples-jbi/maven2/ping-pong-osgi</module>
> - <module>axis2-war</module>
> - <module>distro</module>
> + <module>agents</module>
> + <module>utils</module>
> + <module>jacob-ap</module>
> + <module>jacob</module>
> + <module>bpel-schemas</module>
> + <module>bpel-scripts</module>
> + <module>bpel-api</module>
> + <module>bpel-api-jca</module>
> + <module>bpel-dao</module>
> + <module>bpel-obj</module>
> + <module>dao-jpa</module>
> + <module>jca-ra</module>
> + <module>jca-server</module>
> + <module>scheduler-simple</module>
> + <module>bpel-compiler</module>
> + <module>bpel-epr</module>
> + <module>bpel-ql</module>
> + <module>dao-hibernate</module>
> + <module>tools</module>
> + <module>bpel-store</module>
> + <module>dao-jpa-ojpa-derby</module>
> + <module>dao-hibernate-db</module>
> + <module>bpel-runtime</module>
> + <module>bpel-connector</module>
> + <!--module>bpel-test</module-->
> + <module>axis2</module>
> + <module>jbi</module>
> + <module>jbi-bundle</module>
> + <module>jbi-karaf</module>
> + <module>distro/src/examples-jbi/maven2/ping-pong-osgi</module>
> + <module>axis2-war</module>
> + <module>distro</module>
> </modules>
>
> <build>
> @@ -151,7 +152,7 @@
> <plugin>
> <groupId>org.apache.maven.plugins</groupId>
> <artifactId>maven-compiler-plugin</artifactId>
> - <version>2.0.2</version>
> + <version>2.0.2</version>
> <configuration>
> <source>1.5</source>
> <target>1.5</target>
> @@ -175,11 +176,11 @@
> <artifactId>xdoclet-maven-plugin</artifactId>
> <version>1.0</version>
> <dependencies>
> - <dependency>
> - <groupId>xdoclet</groupId>
> - <artifactId>xjavadoc</artifactId>
> - <version>1.1-j5</version>
> - </dependency>
> + <dependency>
> + <groupId>xdoclet</groupId>
> + <artifactId>xjavadoc</artifactId>
> + <version>1.1-j5</version>
> + </dependency>
> </dependencies>
> </plugin>
>
> @@ -189,23 +190,23 @@
> <version>${xmlbeans.version}</version>
> </plugin>
>
> - <plugin>
> - <groupId>org.codehaus.mojo</groupId>
> - <artifactId>sql-maven-plugin</artifactId>
> - <version>1.2</version>
> - <dependencies>
> - <dependency>
> - <groupId>org.apache.derby</groupId>
> - <artifactId>derby</artifactId>
> - <version>${derby.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>org.apache.derby</groupId>
> - <artifactId>derbytools</artifactId>
> - <version>${derby.version}</version>
> - </dependency>
> - </dependencies>
> - </plugin>
> + <plugin>
> + <groupId>org.codehaus.mojo</groupId>
> + <artifactId>sql-maven-plugin</artifactId>
> + <version>1.2</version>
> + <dependencies>
> + <dependency>
> + <groupId>org.apache.derby</groupId>
> + <artifactId>derby</artifactId>
> + <version>${derby.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>org.apache.derby</groupId>
> + <artifactId>derbytools</artifactId>
> + <version>${derby.version}</version>
> + </dependency>
> + </dependencies>
> + </plugin>
>
> <!-- Allows direct usage of the javadoc:javadoc goal. -->
> <plugin>
> @@ -222,49 +223,53 @@
> </build>
>
>
> -
> <!--|
> | List of repositories for all the various dependencies,
> | and Maven plugins.
> |
> -->
> - <repositories>
> - <repository>
> - <id>servicemix-repo</id>
> - <name>ServiceMix Repository</name>
> - <url>https://repository.apache.org/content/groups/public</url>
> - <releases>
> - <enabled>true</enabled>
> - </releases>
> - <snapshots>
> - <enabled>false</enabled>
> - </snapshots>
> - </repository>
> - <!--
> - <repository>
> - <id>servicemix</id>
> - <name>Apache ServiceMix Repository</name>
> - <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
> - <releases>
> - <enabled>true</enabled>
> - </releases>
> - <snapshots>
> - <enabled>false</enabled>
> - </snapshots>
> - </repository>
> - -->
> - <repository>
> - <id>saxon-repo</id>
> - <name>Saxon Repo</name>
> - <url>http://people.apache.org/~rr/saxon-repo<http://people.apache.org/%7Err/saxon-repo>
> </url>
> - <releases>
> - <enabled>true</enabled>
> - </releases>
> - <snapshots>
> - <enabled>false</enabled>
> - </snapshots>
> - </repository>
> - </repositories>
> + <repositories>
> + <repository>
> + <id>servicemix-repo</id>
> + <name>ServiceMix Repository</name>
> + <url>https://repository.apache.org/content/groups/public
> </url>
> + <releases>
> + <enabled>true</enabled>
> + </releases>
> + <snapshots>
> + <enabled>false</enabled>
> + </snapshots>
> + </repository>
> + <!--
> + <repository>
> + <id>servicemix</id>
> + <name>Apache ServiceMix Repository</name>
> + <url>http://svn.apache.org/repos/asf/servicemix/m2-repo</url>
> + <releases>
> + <enabled>true</enabled>
> + </releases>
> + <snapshots>
> + <enabled>false</enabled>
> + </snapshots>
> + </repository>
> + -->
> + <repository>
> + <id>saxon-repo</id>
> + <name>Saxon Repo</name>
> + <url>http://people.apache.org/~rr/saxon-repo<http://people.apache.org/%7Err/saxon-repo>
> </url>
> + <releases>
> + <enabled>true</enabled>
> + </releases>
> + <snapshots>
> + <enabled>false</enabled>
> + </snapshots>
> + </repository>
> + <repository>
> + <id>central</id>
> + <name>Apache Maven Repo</name>
> + <url>http://repo1.maven.org/maven2/</url>
> + </repository>
> + </repositories>
>
> <!--
> <repositories>
> @@ -505,7 +510,7 @@
> <artifactId>axiom-impl</artifactId>
> <version>${axiom.version}</version>
> </dependency>
> - <dependency>
> + <dependency>
> <groupId>org.apache.ws.commons.axiom</groupId>
> <artifactId>axiom-dom</artifactId>
> <version>${axiom.version}</version>
> @@ -555,11 +560,11 @@
> <artifactId>commons-dbcp</artifactId>
> <version>${commons.dbcp.version}</version>
> </dependency>
> - <dependency>
> - <groupId>commons-primitives</groupId>
> - <artifactId>commons-primitives</artifactId>
> - <version>${commons.primitives.version}</version>
> - </dependency>
> + <dependency>
> + <groupId>commons-primitives</groupId>
> + <artifactId>commons-primitives</artifactId>
> + <version>${commons.primitives.version}</version>
> + </dependency>
> <dependency>
> <groupId>org.apache.geronimo.specs</groupId>
> <artifactId>geronimo-jta_1.1_spec</artifactId>
> @@ -697,26 +702,26 @@
> <artifactId>mail</artifactId>
> <version>${javax.mail.version}</version>
> </dependency>
> - <dependency>
> - <groupId>org.apache.openjpa</groupId>
> - <artifactId>openjpa</artifactId>
> - <version>${openjpa.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>net.sourceforge.serp</groupId>
> - <artifactId>serp</artifactId>
> - <version>${serp.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>dom4j</groupId>
> - <artifactId>dom4j</artifactId>
> - <version>${dom4j.version}</version>
> - </dependency>
> - <dependency>
> - <groupId>xml-apis</groupId>
> - <artifactId>xml-apis</artifactId>
> - <version>${xml-apis.version}</version>
> - </dependency>
> + <dependency>
> + <groupId>org.apache.openjpa</groupId>
> + <artifactId>openjpa</artifactId>
> + <version>${openjpa.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>net.sourceforge.serp</groupId>
> + <artifactId>serp</artifactId>
> + <version>${serp.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>dom4j</groupId>
> + <artifactId>dom4j</artifactId>
> + <version>${dom4j.version}</version>
> + </dependency>
> + <dependency>
> + <groupId>xml-apis</groupId>
> + <artifactId>xml-apis</artifactId>
> + <version>${xml-apis.version}</version>
> + </dependency>
> <dependency>
> <groupId>commons-pool</groupId>
> <artifactId>commons-pool</artifactId>
> @@ -918,6 +923,11 @@
> <version>${axis2.version}</version>
> </dependency>
> <dependency>
> + <groupId>org.apache.axis2</groupId>
> + <artifactId>axis2-transport-jms</artifactId>
> + <version>${axis2.transport.version}</version>
> + </dependency>
> + <dependency>
> <groupId>org.slf4j</groupId>
> <artifactId>slf4j-api</artifactId>
> <version>${slf4j.version}</version>
>
--
Cheers,
Jeff Yu
----------------
blog: http://jeff.familyyu.net