Author: jeff.yuchang Date: 2009-11-17 02:24:05 -0500 (Tue, 17 Nov 2009) New Revision: 268 Modified: trunk/distribution/pom.xml trunk/pom.xml trunk/qa/build.xml Log: * remove the qa maven repo. Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2009-11-17 07:10:53 UTC (rev 267) +++ trunk/distribution/pom.xml 2009-11-17 07:24:05 UTC (rev 268) @@ -165,49 +165,12 @@ </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>get.oracle.driver</id> - <phase>package</phase> - <goals> - <goal>copy</goal> - </goals> - <configuration> - <artifactItems> - <artifactItem> - <groupId>com.oracle</groupId> - <artifactId>ojdbc14</artifactId> - <version>${oracle.version}</version> - <destFileName>ojdbc14.jar</destFileName> - </artifactItem> - </artifactItems> - <outputDirectory>target/libs</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> </build> <repositories> - <!--repository> - <id>bpel-local</id> - <name>jboss bpel localhost repository</name> - <url>file://${repoDir}/repo/m2-snapshot-repository</url> - </repository> - <repository> - <id>bpel</id> - <name>jboss bpel repository</name> - <url>https://svn.devel.redhat.com/repos/ODE/maven2/repo/m2-snapshot-rep... - </repository--> - - <repository> <id>jboss</id> <url>http://repository.jboss.com/maven2/</url> </repository> @@ -235,20 +198,6 @@ <url>http://repo1.maven.org/maven2</url> </repository> - <repository> - <id>qa.jboss.com</id> - <url>http://www.qa.jboss.com/jdbc-drivers/maven2</url> - </repository> - - <!-- Not all dependencies are resolved when using this repository. - Complains about not finding appropriate version of - org.eclipse.equinox.app plugin. --> - <!-- repository> - <id>eclipse</id> - <name>eclipse repository</name> - <url>http://repo1.maven.org/eclipse</url> - </repository--> - </repositories> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-17 07:10:53 UTC (rev 267) +++ trunk/pom.xml 2009-11-17 07:24:05 UTC (rev 268) @@ -70,8 +70,8 @@ <bpm.console.version>1.2.0</bpm.console.version> <commons.logging.version>1.1.1</commons.logging.version> <junit.version>3.8.1</junit.version> - <jboss.version>5.0.0.GA</jboss.version> - <log4j.version>1.2.14</log4j.version> + <jboss.version>5.0.0.GA</jboss.version> + <log4j.version>1.2.14</log4j.version> <rosetta.version>4.5</rosetta.version> <wsdl4j.version>1.6.2</wsdl4j.version> </properties> Modified: trunk/qa/build.xml =================================================================== --- trunk/qa/build.xml 2009-11-17 07:10:53 UTC (rev 267) +++ trunk/qa/build.xml 2009-11-17 07:24:05 UTC (rev 268) @@ -29,6 +29,8 @@ <property name="jbossesb.distro.path" value="${download.dir}/${jbossesb.filename}" /> <property name="org.jboss.as.config" value="default" /> + + <property name="ojdbc.url" value="http://www.qa.jboss.com/jdbc-drivers/maven2/com/oracle/ojdbc1... <echo message="database.......... ${database}" /> <echo message="riftsaw.version...... ${riftsaw.version}" /> @@ -42,6 +44,10 @@ <condition property="is.jbossesb.distro.available"> <available file="${jbossesb.distro.path}" /> </condition> + + <condition property="is.oracle"> + <equals arg1="oracle" arg2="${database}"/> + </condition> <!-- remove the riftsaw.home --> <target name="clean" @@ -73,7 +79,9 @@ <ant dir="${jboss.parent.dir}/jbossesb-${jbossesb.version}/install" target="deploy"> <property name="org.jboss.esb.server.home" value="${jboss.home}" /> <property name="org.jboss.esb.server.config" value="${org.jboss.as.config}" /> - </ant> + </ant> + + <antcall target="get.ojdbc" /> </target> <!-- ### INSTALL RiftSaw into JBossESB ################################################## --> @@ -103,6 +111,13 @@ <mkdir dir="${download.dir}" /> <get src="${jbossesb.distro.url}" dest="${jbossesb.distro.path}" /> </target> + + <target name="get.ojdbc" + if="is.oracle" + description="Download oracle jdbc"> + <mkdir dir="../distribution/target/libs"/> + <get dest="../distribution/target/libs/ojdbc14.jar" src="${ojdbc.url}"/> + </target> <!-- ### Install and Cleanup DB ###################################################### --> <target name="unpack-riftsaw">