You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@tomee.apache.org by bu...@apache.org on 2012/03/09 19:42:05 UTC
svn commit: r808015 - in /websites/staging/openejb/trunk: cgi-bin/ content/
content/examples-trunk/polling-parent/polling-web/src/main/java/jug/routing/
content/examples-trunk/polling-parent/polling-web/src/main/resources/META-INF/jug.polling/
Author: buildbot
Date: Fri Mar 9 18:42:05 2012
New Revision: 808015
Log:
Staging update by buildbot for openejb
Modified:
websites/staging/openejb/trunk/cgi-bin/ (props changed)
websites/staging/openejb/trunk/content/ (props changed)
websites/staging/openejb/trunk/content/examples-trunk/polling-parent/polling-web/src/main/java/jug/routing/PollingRouter.java
websites/staging/openejb/trunk/content/examples-trunk/polling-parent/polling-web/src/main/resources/META-INF/jug.polling/service-jar.xml
Propchange: websites/staging/openejb/trunk/cgi-bin/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 9 18:42:05 2012
@@ -1 +1 @@
-1298970
+1298972
Propchange: websites/staging/openejb/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Mar 9 18:42:05 2012
@@ -1 +1 @@
-1298970
+1298972
Modified: websites/staging/openejb/trunk/content/examples-trunk/polling-parent/polling-web/src/main/java/jug/routing/PollingRouter.java
==============================================================================
--- websites/staging/openejb/trunk/content/examples-trunk/polling-parent/polling-web/src/main/java/jug/routing/PollingRouter.java (original)
+++ websites/staging/openejb/trunk/content/examples-trunk/polling-parent/polling-web/src/main/java/jug/routing/PollingRouter.java Fri Mar 9 18:42:05 2012
@@ -10,38 +10,16 @@ import java.util.Map;
import java.util.logging.Logger;
public class PollingRouter extends AbstractRouter {
- private static final Logger LOGGER = Logger.getLogger(PollingRouter.class.getName());
-
private Map<String, DataSource> dataSources = null;
private ThreadLocal<DataSource> currentDataSource = new ThreadLocal<DataSource>() {
@Override
- public DataSource initialValue() {
- return dataSources.get("jdbc/client1");
- }
+ public DataSource initialValue() { return dataSources.get("jdbc/client1"); }
};
- private void init() {
- dataSources = new HashMap<String, DataSource>();
- for (String ds : Arrays.asList("jdbc/client1", "jdbc/client2")) {
- try {
- final Object o = getOpenEJBResource(ds);
- if (o instanceof DataSource) {
- dataSources.put(ds, DataSource.class.cast(o));
- }
- } catch (NamingException e) {
- // ignored
- }
- }
- }
-
@Override
public DataSource getDataSource() {
- if (dataSources == null) {
- init();
- }
- final DataSource ds = currentDataSource.get();
- LOGGER.info("using ds " + ds);
- return ds;
+ if (dataSources == null) { init(); }
+ return currentDataSource.get();
}
public void setDataSource(final String client) {
@@ -57,6 +35,20 @@ public class PollingRouter extends Abstr
currentDataSource.set(ds);
}
+ private void init() {
+ dataSources = new HashMap<String, DataSource>();
+ for (String ds : Arrays.asList("jdbc/client1", "jdbc/client2")) {
+ try {
+ final Object o = getOpenEJBResource(ds);
+ if (o instanceof DataSource) {
+ dataSources.put(ds, DataSource.class.cast(o));
+ }
+ } catch (NamingException e) {
+ // ignored
+ }
+ }
+ }
+
public void clear() {
currentDataSource.remove();
}
Modified: websites/staging/openejb/trunk/content/examples-trunk/polling-parent/polling-web/src/main/resources/META-INF/jug.polling/service-jar.xml
==============================================================================
--- websites/staging/openejb/trunk/content/examples-trunk/polling-parent/polling-web/src/main/resources/META-INF/jug.polling/service-jar.xml (original)
+++ websites/staging/openejb/trunk/content/examples-trunk/polling-parent/polling-web/src/main/resources/META-INF/jug.polling/service-jar.xml Fri Mar 9 18:42:05 2012
@@ -1,4 +1,5 @@
<ServiceJar>
<ServiceProvider id="PollingRouter"
- service="Resource" type="org.apache.openejb.resource.jdbc.Router" class-name="jug.routing.PollingRouter" />
+ service="Resource" type="org.apache.openejb.resource.jdbc.Router"
+ class-name="jug.routing.PollingRouter" />
</ServiceJar>