.classpath | 2 +- modules/core/dbutils/pom.xml | 4 ---- modules/core/dbutils/src/main/scripts/dbsetup-build.xml | 2 -- modules/core/domain/pom.xml | 1 - modules/enterprise/server/container/pom.xml | 3 --- modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml | 3 --- modules/plugins/oracle/pom.xml | 4 ++-- pom.xml | 8 -------- 8 files changed, 3 insertions(+), 24 deletions(-)
New commits: commit ec8807ad7cf9b987f9c7356ed7b50136ef9f503d Author: Joseph Marques joseph@redhat.com Date: Sun Jan 31 00:06:30 2010 -0500
eliminate references to old ojdbc14 library (ojdbc5 is used exclusively everywhere now)
diff --git a/modules/core/dbutils/pom.xml b/modules/core/dbutils/pom.xml index f644344..a0481b7 100644 --- a/modules/core/dbutils/pom.xml +++ b/modules/core/dbutils/pom.xml @@ -143,7 +143,6 @@ <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml"> <property name="settings.localRepository" value="${settings.localRepository}" /> - <!--<property name="ojdbc14.version" value="${ojdbc14.version}" />--> <property name="ojdbc5.version" value="${ojdbc5.version}" /> <property name="postgresql.version" value="${postgresql.version}" /> <property name="h2.version" value="${h2.version}" /> @@ -175,7 +174,6 @@ <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-combine"> <property name="settings.localRepository" value="${settings.localRepository}" /> - <!--<property name="ojdbc14.version" value="${ojdbc14.version}" />--> <property name="ojdbc5.version" value="${ojdbc5.version}" /> <property name="postgresql.version" value="${postgresql.version}" /> <property name="h2.version" value="${h2.version}" /> @@ -208,7 +206,6 @@ <property name="settings.localRepository" location="${user.home}/.m2/repository" /> <ant antfile="${basedir}/src/main/scripts/dbsetup-build.xml" target="dbsetup-check-schema"> <property name="settings.localRepository" value="${settings.localRepository}" /> - <!--<property name="ojdbc14.version" value="${ojdbc14.version}" />--> <property name="ojdbc5.version" value="${ojdbc5.version}" /> <property name="postgresql.version" value="${postgresql.version}" /> <property name="h2.version" value="${h2.version}" /> @@ -248,7 +245,6 @@ </systemProperties> <!-- The below is required for tests to run against Oracle. --> <additionalClasspathElements> - <!--<additionalClasspathElement>${settings.localRepository}/ojdbc14/ojdbc14/${ojdbc14.version}/ojdbc14-${ojdbc14.version}.jar</additionalClasspathElement>--> <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> diff --git a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml index 5fcc174..76d2c07 100644 --- a/modules/core/dbutils/src/main/scripts/dbsetup-build.xml +++ b/modules/core/dbutils/src/main/scripts/dbsetup-build.xml @@ -54,7 +54,6 @@ To run the default target, you must set one of the following properties to true: unless="dbsetup-init-taskdefs.notrequired"> <path id="full.task.classpath"> <pathelement path="${task.classpath.property}" /> - <!--<pathelement location="${settings.localRepository}/ojdbc14/ojdbc14/${ojdbc14.version}/ojdbc14-${ojdbc14.version}.jar"/>--> <pathelement location="${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar"/> <pathelement location="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"/> <pathelement location="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"/> @@ -306,7 +305,6 @@ To run the default target, you must set one of the following properties to true: print="true" showheaders="false"> <classpath> - <!--<pathelement location="${settings.localRepository}/ojdbc14/ojdbc14/${ojdbc14.version}/ojdbc14-${ojdbc14.version}.jar"/>--> <pathelement location="${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar"/> <pathelement location="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar"/> <pathelement location="${settings.localRepository}/com/h2database/h2/${h2.version}/h2-${h2.version}.jar"/> diff --git a/modules/core/domain/pom.xml b/modules/core/domain/pom.xml index 6bb8118..45241fe 100644 --- a/modules/core/domain/pom.xml +++ b/modules/core/domain/pom.xml @@ -231,7 +231,6 @@ </systemProperties> <!-- The below is required for tests to run against Oracle. --> <additionalClasspathElements> - <!--<additionalClasspathElement>${settings.localRepository}/ojdbc14/ojdbc14/${ojdbc14.version}/ojdbc14-${ojdbc14.version}.jar</additionalClasspathElement>--> <additionalClasspathElement>${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar</additionalClasspathElement> </additionalClasspathElements> </configuration> diff --git a/modules/enterprise/server/container/pom.xml b/modules/enterprise/server/container/pom.xml index 41e0119..39c7122 100644 --- a/modules/enterprise/server/container/pom.xml +++ b/modules/enterprise/server/container/pom.xml @@ -170,7 +170,6 @@ <!-- dependency versions --> <property name="rhq.version" value="${project.version}" /> <property name="jboss.version" value="${jboss.version}" /> - <!--<property name="ojdbc14.version" value="${ojdbc14.version}" />--> <property name="ojdbc5.version" value="${ojdbc5.version}" /> <property name="postgresql.version" value="${postgresql.version}" /> <property name="h2.version" value="${h2.version}" /> @@ -319,8 +318,6 @@ <fileset dir="${deployment.dir}/bin" includes="*.sh" /> <fileset dir="${deployment.dir}/jbossas/bin" includes="*.sh" /> </chmod> - <!-- Delete old ojdbc14 jar(s). --> - <delete verbose="true"><fileset dir="${deployment.dir}/jbossas/server/default/lib" includes="ojdbc14-*.jar" /></delete> </tasks> </configuration> <goals> diff --git a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml index cd6f94a..b9f4181 100644 --- a/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/container/src/main/scripts/rhq-container.build.xml @@ -237,9 +237,6 @@
<property name="jboss.lib.dir" location="${jboss.home}/server/default/lib" /> <echo>Copying additional libs to ${jboss.lib.dir} ...</echo> - <!--<copy file="${settings.localRepository}/ojdbc14/ojdbc14/${ojdbc14.version}/ojdbc14-${ojdbc14.version}.jar" - toDir="${jboss.lib.dir}" failonerror="false" verbose="true" />--> - <delete verbose="true"><fileset dir="${jboss.lib.dir}" includes="ojdbc14-*.jar" /></delete> <copy file="${settings.localRepository}/com/oracle/ojdbc5/${ojdbc5.version}/ojdbc5-${ojdbc5.version}.jar" toDir="${jboss.lib.dir}" failonerror="false" verbose="true" /> <copy file="${settings.localRepository}/postgresql/postgresql/${postgresql.version}/postgresql-${postgresql.version}.jar" diff --git a/modules/plugins/oracle/pom.xml b/modules/plugins/oracle/pom.xml index 8b9a162..1acdb0f 100644 --- a/modules/plugins/oracle/pom.xml +++ b/modules/plugins/oracle/pom.xml @@ -62,8 +62,8 @@ <configuration> <artifactItems> <artifactItem> - <groupId>ojdbc14</groupId> - <artifactId>ojdbc14</artifactId> + <groupId>com.oracle</groupId> + <artifactId>ojdbc5</artifactId> </artifactItem> </artifactItems> <outputDirectory>${project.build.outputDirectory}/lib</outputDirectory> diff --git a/pom.xml b/pom.xml index 2091740..b43da0a 100644 --- a/pom.xml +++ b/pom.xml @@ -68,7 +68,6 @@ <jaxb-impl.version>2.1.6</jaxb-impl.version> <jsf-api.version>1.2_14</jsf-api.version> <jsf-impl.version>1.2_14</jsf-impl.version> - <ojdbc14.version>10.2.0.4.0</ojdbc14.version> <ojdbc5.version>11.2.0.1.0</ojdbc5.version> <ems.version>1.2.11</ems.version> <postgresql.version>8.4-701.jdbc3</postgresql.version> @@ -728,13 +727,6 @@ The driver can not be packaged for OpenSource distributions due to licensing issues, and as such, this profile should not be active by default. --> <dependency> - <groupId>ojdbc14</groupId> - <artifactId>ojdbc14</artifactId> - <version>${ojdbc14.version}</version> - <scope>provided</scope> - </dependency> - - <dependency> <groupId>com.oracle</groupId> <artifactId>ojdbc5</artifactId> <version>${ojdbc5.version}</version>
commit b5db70e718b91679ca57d6a3b92f989add17ca15 Author: Joseph Marques joseph@redhat.com Date: Sat Jan 30 23:57:46 2010 -0500
update .classpath to point to new generated WS classes
diff --git a/.classpath b/.classpath index 43dfd4e..ae63f80 100644 --- a/.classpath +++ b/.classpath @@ -227,7 +227,7 @@ <classpathentry exported="true" kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/hamcrest/hamcrest-library/1.1/hamcrest-library-1.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/antlr/antlr-runtime/3.2/antlr-runtime-3.2.jar"/> - <classpathentry exported="true" kind="lib" path="modules/enterprise/remoting/webservices/target/rhq-remoting-webservices-1.4.0-SNAPSHOT/wsconsume-output"/> + <classpathentry exported="true" kind="lib" path="modules/enterprise/remoting/webservices/target/rhq-remoting-webservices-3.0.0-SNAPSHOT/wsconsume-output"/> <classpathentry exported="true" kind="var" path="M2_REPO/jboss/web/jbossweb/2.0.1.GA/jbossweb-2.0.1.GA.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/libvirt/libvirt/0.4.1/libvirt-0.4.1.jar"/> <classpathentry exported="true" kind="var" path="M2_REPO/org/jboss/byteman/byteman/1.2.1/byteman-1.2.1.jar"/>
rhq-commits@lists.fedorahosted.org