You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by je...@apache.org on 2010/08/02 15:56:38 UTC
svn commit: r981510 - in /ode/trunk: ./ axis2-war/
axis2-war/src/main/assembly/ axis2-war/src/test/maven2/ bpel-test/ jbi/
Author: jeffyu
Date: Mon Aug 2 13:56:37 2010
New Revision: 981510
URL: http://svn.apache.org/viewvc?rev=981510&view=rev
Log:
* update maven-surefire-plugin version, also updated some properties into environment for execution.
* enabled the axis2-war testing module, now only security part test and two other tests were exclude.
Added:
ode/trunk/axis2-war/src/test/maven2/
ode/trunk/axis2-war/src/test/maven2/modules.list
ode/trunk/axis2-war/src/test/maven2/ode-axis2.properties
Modified:
ode/trunk/axis2-war/itest_setup.groovy
ode/trunk/axis2-war/pom.xml
ode/trunk/axis2-war/src/main/assembly/bin.xml
ode/trunk/bpel-test/pom.xml
ode/trunk/jbi/pom.xml
ode/trunk/pom.xml
Modified: ode/trunk/axis2-war/itest_setup.groovy
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/itest_setup.groovy?rev=981510&r1=981509&r2=981510&view=diff
==============================================================================
--- ode/trunk/axis2-war/itest_setup.groovy (original)
+++ ode/trunk/axis2-war/itest_setup.groovy Mon Aug 2 13:56:37 2010
@@ -22,6 +22,10 @@ import java.io.File
def warname = project.build.directory+"/"+project.build.finalName+".war";
def webapp = project.build.directory + "/webapp";
def testresources = new File(project.basedir, 'src/test/webapp')
+def mavenresources = new File(project.basedir, 'src/test/maven2')
+
+def hibconf = webapp + "/WEB-INF/conf.hib-derby";
+def defconf = webapp + "/WEB-INF/conf";
log.info('-----Performing pre-integration test tasks-----');
log.info('extracting the axis2 war');
@@ -32,6 +36,27 @@ ant.copy(todir: webapp) {
include(name: '**')
}
}
+
+log.info('copying some maven specific resources')
+
+ant.copy(todir:defconf, overwrite:true) {
+ fileset(dir: mavenresources) {
+ include(name: 'ode-axis2.properties')
+ }
+}
+
+ant.copy(todir:hibconf, overwrite:true) {
+ fileset(dir: mavenresources) {
+ include(name: 'ode-axis2.properties')
+ }
+}
+
+ant.copy(todir:webapp + "/WEB-INF/modules") {
+ fileset(dir: mavenresources) {
+ include(name: 'modules.list')
+ }
+}
+
//This was in buildr, don't know if it is needed
//copy target/test-classes/TestEndpointProperties/*_global_conf*.endpoint to webapp/WEB-INF/conf
Modified: ode/trunk/axis2-war/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/pom.xml?rev=981510&r1=981509&r2=981510&view=diff
==============================================================================
--- ode/trunk/axis2-war/pom.xml (original)
+++ ode/trunk/axis2-war/pom.xml Mon Aug 2 13:56:37 2010
@@ -40,6 +40,7 @@
<geronimo-spec-jms.version>1.1-rc4</geronimo-spec-jms.version>
<jetty.version>6.1.3</jetty.version>
<testng.version>5.8</testng.version>
+ <axis2.tcp.version>1.0.0</axis2.tcp.version>
</properties>
<dependencies>
@@ -139,6 +140,11 @@
<version>${axis2.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-transport-tcp</artifactId>
+ <version>${axis2.tcp.version}</version>
+ </dependency>
+ <dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
@@ -188,7 +194,6 @@
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
</dependency>
- <!--
<dependency>
<groupId>org.apache.rampart</groupId>
<artifactId>rampart</artifactId>
@@ -200,26 +205,13 @@
<artifactId>rahas</artifactId>
<type>mar</type>
<version>${rampart.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>addressing</artifactId>
- <type>mar</type>
- <version>${rampart.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>mex</artifactId>
- <type>mar</type>
- <version>${mex.version}</version>
- </dependency>
- -->
- <dependency>
+ </dependency>
+ <!-- dependency>
<groupId>org.apache.axis2</groupId>
<artifactId>mex</artifactId>
<classifier>impl</classifier>
<version>${mex.version}</version>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -245,6 +237,33 @@
<version>${jetty.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ <version>2.1_3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ <version>1.5.3</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
@@ -345,6 +364,13 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <log4j.configuration>test-log4j.properties</log4j.configuration>
+ <org.apache.ode.scheduler.deleteJobsOnStart>true</org.apache.ode.scheduler.deleteJobsOnStart>
+ <org.apache.ode.autoRetireProcess>true</org.apache.ode.autoRetireProcess>
+ </systemPropertyVariables>
+ </configuration>
<executions>
<execution>
<id>test-axis2-web</id>
@@ -353,11 +379,20 @@
<goal>test</goal>
</goals>
<configuration>
- <forkMode>always</forkMode>
- <redirectTestOutputToFile>true</redirectTestOutputToFile>
+ <argLine>-Xms512M -Xmx1024M -XX:MaxPermSize=512M</argLine>
+ <forkMode>perTest</forkMode>
<additionalClasspathElements>
<additionalClasspathElement>${project.build.directory}</additionalClasspathElement>
</additionalClasspathElements>
+ <excludes>
+ <exclude>**/management/DeploymentTest.java</exclude>
+ <exclude>**/management/InstanceManagementTest.java</exclude>
+ <exclude>**/rampart/basic/*Test.java</exclude>
+ <exclude>**/rampart/policy/*Test.java</exclude>
+ </excludes>
+ <includes>
+ <include>**/*Test.java</include>
+ </includes>
</configuration>
</execution>
</executions>
Modified: ode/trunk/axis2-war/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/main/assembly/bin.xml?rev=981510&r1=981509&r2=981510&view=diff
==============================================================================
--- ode/trunk/axis2-war/src/main/assembly/bin.xml (original)
+++ ode/trunk/axis2-war/src/main/assembly/bin.xml Mon Aug 2 13:56:37 2010
@@ -47,6 +47,11 @@
</fileSet>
<fileSet>
+ <directory>${basedir}/../dao-hibernate-db/target/h2</directory>
+ <outputDirectory>/WEB-INF</outputDirectory>
+ </fileSet>
+
+ <fileSet>
<directory>${basedir}/../axis2/src/main/wsdl</directory>
<outputDirectory>/WEB-INF</outputDirectory>
</fileSet>
@@ -95,20 +100,16 @@
<include>org.apache.axis2:axis2-java2wsdl</include>
<include>org.apache.axis2:axis2-jaxbri</include>
<include>org.apache.axis2:axis2-jaxws</include>
- <include>org.apache.axis2:axis2-jaxws-api</include>
- <include>org.apache.axis2:axis2-jibx</include>
<include>org.apache.axis2:axis2-json</include>
- <include>org.apache.axis2:axis2-jws-api</include>
<include>org.apache.axis2:axis2-kernel</include>
<include>org.apache.axis2:axis2-metadata</include>
<include>org.apache.axis2:axis2-mtompolicy</include>
<include>org.apache.axis2:axis2-saaj</include>
- <include>org.apache.axis2:axis2-saaj-api</include>
<include>org.apache.axis2:axis2-spring</include>
<include>org.apache.axis2:axis2-xmlbeans</include>
<include>org.apache.axis2:axis2-transport-http</include>
<include>org.apache.axis2:axis2-transport-local</include>
- <include>org.apache.axis2:axis2-transports</include>
+ <include>org.apache.axis2:axis2-transport-tcp</include>
<include>org.apache.ws.commons.axiom:axiom-api</include>
<include>org.apache.ws.commons.axiom:axiom-impl</include>
<include>org.apache.ws.commons.axiom:axiom-dom</include>
@@ -151,7 +152,6 @@
<include>org.opensaml:opensaml</include>
<include>bouncycastle:bcprov-jdk15</include>
<include>org.jibx:jibx-run</include>
- <include>org.jibx:jibx-bind</include>
<include>org.codehaus.jettison:jettison</include>
<include>jaxen:jaxen</include>
<include>log4j:log4j</include>
@@ -167,7 +167,6 @@
<include>xalan:xalan</include>
<include>org.apache.xmlbeans:xmlbeans</include>
<include>org.apache.httpcomponents:httpcore</include>
- <include>org.apache.httpcomponents:httpcore-nio</include>
<include>javax.xml.bind:jaxb-api</include>
<include>com.sun.xml.bind:jaxb-impl</include>
<include>com.sun.xml.bind:jaxb-xjc</include>
@@ -177,17 +176,16 @@
<include>axion:axion</include>
<include>org.springframework:spring</include>
</includes>
- </dependencySet>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>/WEB-INF/modules</outputDirectory>
+ <includes>
+ <include>org.apache.rampart:rampart:mar</include>
+ <include>org.apache.rampart:rahas:mar</include>
+ </includes>
+ </dependencySet>
- <dependencySet>
- <outputDirectory>/WEB-INF/modules</outputDirectory>
- <includes>
- <include>org.apache.rampart:rampart:mar</include>
- <include>org.apache.rampart:rahas:mar</include>
- <include>org.apache.axis2:addressing:mar</include>
- <include>org.apache.axis2:mex:mar</include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
Added: ode/trunk/axis2-war/src/test/maven2/modules.list
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/maven2/modules.list?rev=981510&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/test/maven2/modules.list (added)
+++ ode/trunk/axis2-war/src/test/maven2/modules.list Mon Aug 2 13:56:37 2010
@@ -0,0 +1,25 @@
+#
+# 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.
+#
+addressing-1.5.1.mar
+soapmonitor-1.5.1.mar
+ping-1.5.1.mar
+mex-1.5.1.mar
+axis2-scripting-1.5.1.mar
+rampart-1.5.mar
+rahas-1.5.mar
\ No newline at end of file
Added: ode/trunk/axis2-war/src/test/maven2/ode-axis2.properties
URL: http://svn.apache.org/viewvc/ode/trunk/axis2-war/src/test/maven2/ode-axis2.properties?rev=981510&view=auto
==============================================================================
--- ode/trunk/axis2-war/src/test/maven2/ode-axis2.properties (added)
+++ ode/trunk/axis2-war/src/test/maven2/ode-axis2.properties Mon Aug 2 13:56:37 2010
@@ -0,0 +1,27 @@
+#
+# 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.
+#
+
+ode-axis2.dao.factory=org.apache.ode.axis2.instancecleanup.HibDaoConnectionFactoryImpl
+ode-axis2.db.mode=INTERNAL
+ode-axis2.db.int.jdbcurl=jdbc:h2:file:${basedir}/target/webapp/WEB-INF/hibdb/ode-hib-h2;DB_CLOSE_ON_EXIT=false;user=sa;TRACE_LEVEL_FILE=3
+ode-axis2.db.int.driver=org.h2.Driver
+ode-axis2.cluster.localRoute.targets=http://doesntexist:8080/ode/processes/
+ode-axis2.cluster.localRoute.base=http://localhost:8888/ode/processes/
+ode-axis2.event.listeners=org.apache.ode.bpel.common.evt.DebugBpelEventListener
+#hibernate.dialect=org.hibernate.dialect.H2Dialect
+ode-axis2.acquireTransactionLocks=true
+
Modified: ode/trunk/bpel-test/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/pom.xml?rev=981510&r1=981509&r2=981510&view=diff
==============================================================================
--- ode/trunk/bpel-test/pom.xml (original)
+++ ode/trunk/bpel-test/pom.xml Mon Aug 2 13:56:37 2010
@@ -159,11 +159,13 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- </excludes>
- </configuration>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <systemPropertyVariables>
+ <org.apache.ode.autoRetireProcess>true</org.apache.ode.autoRetireProcess>
+ </systemPropertyVariables>
+ <argLine>-Xms512M -Xmx1024M -XX:MaxPermSize=512M</argLine>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: ode/trunk/jbi/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/jbi/pom.xml?rev=981510&r1=981509&r2=981510&view=diff
==============================================================================
--- ode/trunk/jbi/pom.xml (original)
+++ ode/trunk/jbi/pom.xml Mon Aug 2 13:56:37 2010
@@ -424,16 +424,10 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
- <!-- FIXME: temporary skip it -->
- <!--
- <skipTests>true</skipTests>
- -->
- <systemProperties>
- <property>
- <name>java.naming.factory.initial</name>
- <value>org.apache.xbean.spring.jndi.SpringInitialContextFactory</value>
- </property>
- </systemProperties>
+ <systemPropertyVariables>
+ <java.naming.factory.initial>org.apache.xbean.spring.jndi.SpringInitialContextFactory</java.naming.factory.initial>
+ <org.apache.ode.autoRetireProcess>true</org.apache.ode.autoRetireProcess>
+ </systemPropertyVariables>
</configuration>
</plugin>
<plugin>
Modified: ode/trunk/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/pom.xml?rev=981510&r1=981509&r2=981510&view=diff
==============================================================================
--- ode/trunk/pom.xml (original)
+++ ode/trunk/pom.xml Mon Aug 2 13:56:37 2010
@@ -66,7 +66,7 @@
<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>
+ <rampart.version>1.5</rampart.version>
<commons.codec.version>1.3</commons.codec.version>
<backport.concurrent.version>3.1</backport.concurrent.version>
<commons.fileupload.version>1.2</commons.fileupload.version>
@@ -126,6 +126,7 @@
<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>
+ <h2.version>1.1.117</h2.version>
</properties>
<modules>
@@ -158,7 +159,7 @@
<module>jbi-bundle</module>
<module>jbi-karaf</module>
<module>distro/src/examples-jbi/maven2/ping-pong-osgi</module>
- <!--module>axis2-war</module-->
+ <module>axis2-war</module>
<module>bpel-itest</module>
</modules>
@@ -184,7 +185,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.4.3</version>
+ <version>2.5</version>
</plugin>
@@ -227,6 +228,11 @@
<artifactId>derbytools</artifactId>
<version>${derby.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ </dependency>
</dependencies>
</plugin>
@@ -850,6 +856,12 @@
<version>${hsqldb.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ </dependency>
+
<!-- AXIS2 dependencies -->
<dependency>
<groupId>org.apache.axis2</groupId>