diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java index cd77f1ae2120257f75ab0289b2660f38566e75a7..513f743ef561e77cf72697a3346ed8e273d1fbdc 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java @@ -32,7 +32,6 @@ import org.apache.log4j.Logger; import ch.rinn.restrictions.Private; import ch.systemsx.cisd.base.exceptions.InterruptedExceptionUnchecked; -import ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo; import ch.systemsx.cisd.common.Constants; import ch.systemsx.cisd.common.TimingParameters; import ch.systemsx.cisd.common.concurrent.TimerUtilities; @@ -61,6 +60,7 @@ import ch.systemsx.cisd.common.utilities.PropertyUtils; import ch.systemsx.cisd.common.utilities.SystemExit; import ch.systemsx.cisd.etlserver.validation.DataSetValidator; import ch.systemsx.cisd.etlserver.validation.IDataSetValidator; +import ch.systemsx.cisd.openbis.dss.BuildAndEnvironmentInfo; import ch.systemsx.cisd.openbis.dss.generic.shared.IEncapsulatedOpenBISService; import ch.systemsx.cisd.openbis.dss.generic.shared.ServiceProvider; import ch.systemsx.cisd.openbis.dss.generic.shared.utils.PropertyParametersUtil; diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java index 1b0c4a3454fdf9d3dc34e14aa593ed66e11f7c97..aa1681476b8c8d8f0c3fada0d36b2f08d24cca3f 100644 --- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java +++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/Parameters.java @@ -25,7 +25,6 @@ import ch.systemsx.cisd.args4j.CmdLineException; import ch.systemsx.cisd.args4j.CmdLineParser; import ch.systemsx.cisd.args4j.ExampleMode; import ch.systemsx.cisd.args4j.Option; -import ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo; import ch.systemsx.cisd.common.TimingParameters; import ch.systemsx.cisd.common.exceptions.ConfigurationFailureException; import ch.systemsx.cisd.common.exceptions.UserFailureException; @@ -36,6 +35,7 @@ import ch.systemsx.cisd.common.utilities.ExtendedProperties; import ch.systemsx.cisd.common.utilities.IExitHandler; import ch.systemsx.cisd.common.utilities.PropertyUtils; import ch.systemsx.cisd.common.utilities.SystemExit; +import ch.systemsx.cisd.openbis.dss.BuildAndEnvironmentInfo; import ch.systemsx.cisd.openbis.dss.generic.shared.utils.PropertyParametersUtil; import ch.systemsx.cisd.openbis.dss.generic.shared.utils.PropertyParametersUtil.SectionProperties; diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.java new file mode 100644 index 0000000000000000000000000000000000000000..170231bae99dd8239c05b8f0976f83ada832e5ee --- /dev/null +++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/BuildAndEnvironmentInfo.java @@ -0,0 +1,46 @@ +/* + * Copyright 2009 ETH Zuerich, CISD + * + * Licensed 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. + */ + +package ch.systemsx.cisd.openbis.dss; + +import ch.systemsx.cisd.base.utilities.AbstractBuildAndEnvironmentInfo; + + +/** + * The build and environment information for Data Store Server. + * + * @author Franz-Josef Elmer + */ +public class BuildAndEnvironmentInfo extends AbstractBuildAndEnvironmentInfo +{ + private final static String BASE = "datastore_server"; + + public final static BuildAndEnvironmentInfo INSTANCE = new BuildAndEnvironmentInfo(); + + private BuildAndEnvironmentInfo() + { + super(BASE); + } + + /** + * Shows build and environment information on the console. + */ + public static void main(String[] args) + { + System.out.println(INSTANCE); + } + +}