Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LUT-26061: Remove RDBMS drivers jar names from build system #9

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

LUT-26061: Remove RDBMS drivers jar names from build system #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions src/main/resources/build-config/ant/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,6 @@
on_sql_error=continue
db.encoding=utf-8

#Set path of some JDBC connectors
hsqldb.connector.jar.path=../lib/hsqldb-2.3.4.jar
mysql.connector.jar.path=../lib/mysql-connector-java-8.0.26.jar
oracle.connector.jar.path=../lib/ojdbc14-10.2.0.3.0.jar
postgresql.connector.jar.path=../lib/postgresql-9.4.1211.jar

#Replacement rules for specific DBMS
# Format is :
# regexp.${dbms}.list : list of index for each replacement rule, separated by comma
Expand Down
21 changes: 5 additions & 16 deletions src/main/resources/build-config/ant/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
<attribute name="sql.url" />
<attribute name="sql.userid" />
<attribute name="sql.password" />
<attribute name="sql.connector.path" />
<attribute name="sql.fileset.refid"/>
<sequential>
<!--echo message="sql.driver : @{sql.driver}" />
Expand Down Expand Up @@ -41,11 +40,15 @@
userid="@{sql.userid}"
password="@{sql.password}"
autocommit="true"
classpath="@{sql.connector.path}"
onerror="${on_sql_error}"
encoding="${db.encoding}"
>
<fileset file="${temp.sql}"/>
<classpath>
<fileset dir="../lib">
<include name="*.jar"/>
</fileset>
</classpath>
</sql>
<delete file="${temp.sql}" verbose="true" />
</sequential>
Expand Down Expand Up @@ -103,9 +106,6 @@
<target name="init_mysql" if="mysql">
<echo message="=> MySQL" />

<!-- Path to the jar that contain database connector driver -->
<property name="db.connector.path" value="${mysql.connector.jar.path}" />

<!-- Define the baseUrl and baseName (drop and create DB) -->
<property file="${db.properties.path}" />
<propertyregex property="baseUrl"
Expand All @@ -126,9 +126,6 @@
<target name="init_oracle" if="oracle">
<echo message="=> Oracle" />

<!-- Path to the jar that contain database connector driver -->
<property name="db.connector.path" value="${oracle.connector.jar.path}" />

<!-- Define the baseUrl and baseName (drop and create DB) -->
<property file="${db.properties.path}" />
<propertyregex property="baseUrl"
Expand All @@ -149,9 +146,6 @@
<target name="init_hsqldb" if="hsqldb">
<echo message="=> HSQLDB" />

<!-- Path to the jar that contain database connector driver -->
<property name="db.connector.path" value="${hsqldb.connector.jar.path}" />

<!-- Define the baseUrl and baseName (drop and create DB) -->
<property file="${db.properties.path}" />
<property name="baseUrl" value="${portal.url}" />
Expand All @@ -166,9 +160,6 @@
<target name="init_postgresql" if="postgresql">
<echo message="=> POSTGRESQL" />

<!-- Path to the jar that contain database connector driver -->
<property name="db.connector.path" value="${postgresql.connector.jar.path}" />

<!-- Define the baseUrl and baseName (drop and create DB) -->
<property file="${db.properties.path}" />
<propertyregex property="baseUrl"
Expand Down Expand Up @@ -234,7 +225,6 @@
sql.url="${baseUrl}"
sql.userid="${portal.user}"
sql.password="${portal.password}"
sql.connector.path="${db.connector.path}"
sql.fileset.refid="sql.db.create" />

<delete file="${dbms}.sql" verbose="true" />
Expand All @@ -254,7 +244,6 @@
sql.url="${portal.url}"
sql.userid="${portal.user}"
sql.password="${portal.password}"
sql.connector.path="${db.connector.path}"
sql.fileset.refid="sql.core.files"/>
</target>

Expand Down
3 changes: 0 additions & 3 deletions src/main/resources/build-config/ant/includes/build-all.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
sql.url="${baseUrlPlugins}"
sql.userid="${plugins.user}"
sql.password="${plugins.password}"
sql.connector.path="${db.connector.path}"
sql.fileset.refid="sql.db.create"
/>
</then>
Expand All @@ -54,15 +53,13 @@
sql.url="${plugins.url}"
sql.userid="${plugins.user}"
sql.password="${plugins.password}"
sql.connector.path="${db.connector.path}"
sql.fileset.refid="sql.plugin.files" />
</then>
<else>
<runsql sql.driver="${portal.driver}"
sql.url="${portal.url}"
sql.userid="${portal.user}"
sql.password="${portal.password}"
sql.connector.path="${db.connector.path}"
sql.fileset.refid="sql.plugin.files" />
</else>
</if>
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/build-config/ant/includes/build-oldstructure.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
sql.url="${portal.url}"
sql.userid="${portal.user}"
sql.password="${portal.password}"
sql.connector.path="${db.connector.path}"
sql.fileset.refid="sql.plugin.files" />
</target>
</project>
3 changes: 0 additions & 3 deletions src/main/resources/build-config/ant/includes/build-specific.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
sql.url="${baseUrl.pool}"
sql.userid="${@{pool}.user}"
sql.password="${@{pool}.password}"
sql.connector.path="${db.connector.path}"
sql.fileset.refid="sql.db.create"
/>

Expand All @@ -81,7 +80,6 @@
sql.url="${@{pool}.url}"
sql.userid="${@{pool}.user}"
sql.password="${@{pool}.password}"
sql.connector.path="${db.connector.path}"
sql.fileset.refid="sql.plugin.files"
/>
</then>
Expand All @@ -97,7 +95,6 @@
sql.url="${portal.url}"
sql.userid="${portal.user}"
sql.password="${portal.password}"
sql.connector.path="${db.connector.path}"
sql.fileset.refid="sql.plugin.files"/>
</else>
</if>
Expand Down
2 changes: 0 additions & 2 deletions src/main/resources/build-config/ant/includes/build-update.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@
sql.url="${@{pool}.url}"
sql.userid="${@{pool}.user}"
sql.password="${@{spool}.password}"
sql.classpath="${db.connector.path}"
sql.fileset.refid="sql.plugin.files"
/>
</then>
Expand All @@ -78,7 +77,6 @@
sql.url="${portal.url}"
sql.userid="${portal.user}"
sql.password="${portal.password}"
sql.connector.path="${db.connector.path}"
sql.fileset.refid="sql.plugin.files"/>
</else>
</if>
Expand Down