Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openbis
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
sispub
openbis
Commits
757c32fa
Commit
757c32fa
authored
17 years ago
by
izabel
Browse files
Options
Downloads
Patches
Plain Diff
get rid of organization
SVN: 5330
parent
5dac425e
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java
+37
-19
37 additions, 19 deletions
...stemsx/cisd/dbmigration/DatabaseConfigurationContext.java
with
37 additions
and
19 deletions
dbmigration/source/java/ch/systemsx/cisd/dbmigration/DatabaseConfigurationContext.java
+
37
−
19
View file @
757c32fa
...
@@ -81,6 +81,8 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -81,6 +81,8 @@ public class DatabaseConfigurationContext implements DisposableBean
private
String
urlHostPart
;
private
String
urlHostPart
;
private
String
groupCode
;
public
DatabaseConfigurationContext
()
public
DatabaseConfigurationContext
()
{
{
setOwner
(
null
);
setOwner
(
null
);
...
@@ -92,6 +94,16 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -92,6 +94,16 @@ public class DatabaseConfigurationContext implements DisposableBean
this
.
dataSourceFactory
=
dataSourceFactory
;
this
.
dataSourceFactory
=
dataSourceFactory
;
}
}
public
final
String
getGroupCode
()
throws
ConfigurationFailureException
{
return
groupCode
;
}
public
final
void
setGroupCode
(
String
groupCode
)
throws
ConfigurationFailureException
{
this
.
groupCode
=
groupCode
;
}
private
final
static
void
closeConnection
(
final
DataSource
dataSource
)
private
final
static
void
closeConnection
(
final
DataSource
dataSource
)
{
{
if
(
dataSource
!=
null
)
if
(
dataSource
!=
null
)
...
@@ -158,7 +170,8 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -158,7 +170,8 @@ public class DatabaseConfigurationContext implements DisposableBean
* Returns user name of the administrator.
* Returns user name of the administrator.
*
*
* @return The default admin user of the database engine when undefined.
* @return The default admin user of the database engine when undefined.
* @throws ConfigurationFailureException If neither the admin user nor the database engine are defined.
* @throws ConfigurationFailureException If neither the admin user nor the database engine are
* defined.
*/
*/
private
final
String
getAdminUser
()
throws
ConfigurationFailureException
private
final
String
getAdminUser
()
throws
ConfigurationFailureException
{
{
...
@@ -217,8 +230,8 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -217,8 +230,8 @@ public class DatabaseConfigurationContext implements DisposableBean
}
}
/**
/**
* Returns the basic name of the database. The kind of database will be added to this to create
the full database
* Returns the basic name of the database. The kind of database will be added to this to create
* name.
*
the full database
name.
*/
*/
public
String
getBasicDatabaseName
()
public
String
getBasicDatabaseName
()
{
{
...
@@ -228,8 +241,8 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -228,8 +241,8 @@ public class DatabaseConfigurationContext implements DisposableBean
/**
/**
* Returns data source for admin purposes.
* Returns data source for admin purposes.
*
*
* @throws ConfigurationFailureException If not all relevant information has been defined that
is needed for the
* @throws ConfigurationFailureException If not all relevant information has been defined that
* admin data source.
*
is needed for the
admin data source.
*/
*/
public
final
DataSource
getAdminDataSource
()
throws
ConfigurationFailureException
public
final
DataSource
getAdminDataSource
()
throws
ConfigurationFailureException
{
{
...
@@ -251,8 +264,8 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -251,8 +264,8 @@ public class DatabaseConfigurationContext implements DisposableBean
}
}
/**
/**
* Sets the user name of the owner of the database. If <var>owner</var> is <code>null</code>
or empty, the OS
* Sets the user name of the owner of the database. If <var>owner</var> is <code>null</code>
* user running the VM will be set instead.
*
or empty, the OS
user running the VM will be set instead.
*/
*/
public
final
void
setOwner
(
String
owner
)
public
final
void
setOwner
(
String
owner
)
{
{
...
@@ -274,8 +287,8 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -274,8 +287,8 @@ public class DatabaseConfigurationContext implements DisposableBean
}
}
/**
/**
* Sets the password part of the database credentials for the db owner. A <code>null</code>
password will be
* Sets the password part of the database credentials for the db owner. A <code>null</code>
* replaced by an empty string.
*
password will be
replaced by an empty string.
*/
*/
public
final
void
setPassword
(
String
password
)
public
final
void
setPassword
(
String
password
)
{
{
...
@@ -291,8 +304,9 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -291,8 +304,9 @@ public class DatabaseConfigurationContext implements DisposableBean
/**
/**
* Sets user name of the administrator.
* Sets user name of the administrator.
*
*
* @param adminUser New value. Can be <code>null</code>. For convenience when using with Spring property
* @param adminUser New value. Can be <code>null</code>. For convenience when using with
* placeholders, an empty string will be replaced by <code>null</code>.
* Spring property placeholders, an empty string will be replaced by
* <code>null</code>.
*/
*/
public
final
void
setAdminUser
(
String
adminUser
)
public
final
void
setAdminUser
(
String
adminUser
)
{
{
...
@@ -306,7 +320,8 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -306,7 +320,8 @@ public class DatabaseConfigurationContext implements DisposableBean
}
}
/**
/**
* Sets the basic name of the database. The kind of database will be added to this to create the full database name.
* Sets the basic name of the database. The kind of database will be added to this to create the
* full database name.
*
*
* @param basicDatabaseName The basic name of the database. Must not be <code>null</code>.
* @param basicDatabaseName The basic name of the database. Must not be <code>null</code>.
*/
*/
...
@@ -343,8 +358,9 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -343,8 +358,9 @@ public class DatabaseConfigurationContext implements DisposableBean
}
}
/**
/**
* Sets the host part of the URL. <var>urlHostPart</var> can be <code>null</code>. For convenince when using
* Sets the host part of the URL. <var>urlHostPart</var> can be <code>null</code>. For
* with Spring property placeholders, an empty string will be replaced by <code>null</code>.
* convenince when using with Spring property placeholders, an empty string will be replaced by
* <code>null</code>.
*/
*/
public
final
void
setUrlHostPart
(
String
urlHostPart
)
public
final
void
setUrlHostPart
(
String
urlHostPart
)
{
{
...
@@ -407,7 +423,8 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -407,7 +423,8 @@ public class DatabaseConfigurationContext implements DisposableBean
}
}
/**
/**
* Returns <code>true</code> if the current database should be dropped and (re)created from scratch.
* Returns <code>true</code> if the current database should be dropped and (re)created from
* scratch.
*
*
* @return <code>false</code> when the database should only be migrated if necessary.
* @return <code>false</code> when the database should only be migrated if necessary.
*/
*/
...
@@ -425,8 +442,9 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -425,8 +442,9 @@ public class DatabaseConfigurationContext implements DisposableBean
}
}
/**
/**
* Returns <code>true</code> if scripts in the db migration engine should be executed statement by statement. This
* Returns <code>true</code> if scripts in the db migration engine should be executed
* mode gives better error messages on where the faulty SQL is but on the other hand it is a lot slower.
* statement by statement. This mode gives better error messages on where the faulty SQL is but
* on the other hand it is a lot slower.
*/
*/
public
final
boolean
isScriptSingleStepMode
()
public
final
boolean
isScriptSingleStepMode
()
{
{
...
@@ -442,8 +460,8 @@ public class DatabaseConfigurationContext implements DisposableBean
...
@@ -442,8 +460,8 @@ public class DatabaseConfigurationContext implements DisposableBean
}
}
/**
/**
* Sets database kind. This will be append to the name of the database. It allows to have
different database
* Sets database kind. This will be append to the name of the database. It allows to have
* instances in parallel (for developing, testing, etc.).
*
different database
instances in parallel (for developing, testing, etc.).
*
*
* @param databaseKind New value. Can be <code>null</code>.
* @param databaseKind New value. Can be <code>null</code>.
*/
*/
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment