Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into features/TS
- Loading branch information
Showing
320 changed files
with
27,899 additions
and
9,134 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
core/db/src/main/java/org/opennms/core/db/AtomikosDataSourceFactory.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| /******************************************************************************* | ||
| * This file is part of OpenNMS(R). | ||
| * | ||
| * Copyright (C) 2012 The OpenNMS Group, Inc. | ||
| * OpenNMS(R) is Copyright (C) 1999-2012 The OpenNMS Group, Inc. | ||
| * | ||
| * OpenNMS(R) is a registered trademark of The OpenNMS Group, Inc. | ||
| * | ||
| * OpenNMS(R) is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published | ||
| * by the Free Software Foundation, either version 3 of the License, | ||
| * or (at your option) any later version. | ||
| * | ||
| * OpenNMS(R) is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with OpenNMS(R). If not, see: | ||
| * http://www.gnu.org/licenses/ | ||
| * | ||
| * For more information contact: | ||
| * OpenNMS(R) Licensing <license@opennms.org> | ||
| * http://www.opennms.org/ | ||
| * http://www.opennms.com/ | ||
| *******************************************************************************/ | ||
|
|
||
| package org.opennms.core.db; | ||
|
|
||
| import java.sql.SQLException; | ||
| import java.sql.SQLFeatureNotSupportedException; | ||
| import java.util.logging.Logger; | ||
|
|
||
| import org.opennms.netmgt.config.opennmsDataSources.JdbcDataSource; | ||
|
|
||
| import com.atomikos.jdbc.AtomikosDataSourceBean; | ||
|
|
||
|
|
||
| /** | ||
| <bean id="dataSource" class="com.atomikos.jdbc.AtomikosDataSourceBean" destroy-method="close"> | ||
| <property name="uniqueResourceName" value="opennms"/> | ||
| <property name="xaDataSource"> | ||
| <bean class="org.opennms.core.db.XADataSourceFactoryBean" /> | ||
| </property> | ||
| <property name="poolSize" value="30"/> | ||
| <!-- This test query assures that connections are refreshed following a database restart --> | ||
| <property name="testQuery" value="SELECT 1"/> | ||
| </bean> | ||
| */ | ||
|
|
||
| public class AtomikosDataSourceFactory extends AtomikosDataSourceBean implements ClosableDataSource { | ||
|
|
||
| private static final long serialVersionUID = -6411281260947841402L; | ||
|
|
||
| public AtomikosDataSourceFactory(JdbcDataSource ds) { | ||
| this(); | ||
| } | ||
|
|
||
| public AtomikosDataSourceFactory() { | ||
| super.setUniqueResourceName("opennms"); | ||
| super.setXaDataSource(XADataSourceFactory.getInstance()); | ||
| super.setPoolSize(30); | ||
| super.setTestQuery("SELECT 1"); | ||
| } | ||
|
|
||
| // Uncomment when we require Java 7 | ||
| //@Override | ||
| public Logger getParentLogger() throws SQLFeatureNotSupportedException { | ||
| throw new SQLFeatureNotSupportedException(); | ||
| } | ||
|
|
||
| @Override | ||
| public <T> T unwrap(Class<T> iface) throws SQLException { | ||
| throw new SQLException(); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean isWrapperFor(Class<?> iface) throws SQLException { | ||
| return false; | ||
| } | ||
|
|
||
| @Override | ||
| public void setIdleTimeout(int idleTimeout) { | ||
| super.setMaxIdleTime(idleTimeout); | ||
| } | ||
|
|
||
| @Override | ||
| public void setMinPool(int minPool) { | ||
| super.setMinPoolSize(minPool); | ||
| } | ||
|
|
||
| @Override | ||
| public void setMaxPool(int maxPool) { | ||
| super.setMaxPoolSize(maxPool); | ||
| } | ||
|
|
||
| @Override | ||
| public void setMaxSize(int maxSize) { | ||
| super.setMaxPoolSize(maxSize); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
177 changes: 0 additions & 177 deletions
177
core/db/src/main/java/org/opennms/core/db/C3P0ConnectionFactory.java
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.