svn commit: r1197397 - in /myfaces/extensions/cdi/trunk/jee-modules/jpa-module: api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/ impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/datasource/

[gp...@apache.org]

Author: gpetracek
Date: Fri Nov  4 03:32:18 2011
New Revision: 1197397

URL: http://svn.apache.org/viewvc?rev=1197397&view=rev
Log:
EXTCDI-236 ConfigurableDataSource as placeholder for using it in a config

Added:
    myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/ConfigurableDataSource.java
Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/AbstractConfigurableDataSource.java
    myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/datasource/DefaultConfigurableDataSource.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/AbstractConfigurableDataSource.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/AbstractConfigurableDataSource.java?rev=1197397&r1=1197396&r2=1197397&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/AbstractConfigurableDataSource.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/AbstractConfigurableDataSource.java Fri Nov  4 03:32:18 2011
@@ -162,7 +162,7 @@ public abstract class AbstractConfigurab
         throw new SQLFeatureNotSupportedException();
     }
 
-    protected void initDataSource() throws SQLException
+    protected synchronized void initDataSource() throws SQLException
     {
         // double check lock idiom on volatile member is ok as of Java5
         if (wrappedDataSource != null)

Added: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/ConfigurableDataSource.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/ConfigurableDataSource.java?rev=1197397&view=auto
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/ConfigurableDataSource.java (added)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/api/src/main/java/org/apache/myfaces/extensions/cdi/jpa/api/datasource/ConfigurableDataSource.java Fri Nov  4 03:32:18 2011
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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 org.apache.myfaces.extensions.cdi.jpa.api.datasource;
+
+import org.apache.myfaces.extensions.cdi.core.api.provider.BeanManagerProvider;
+
+import javax.enterprise.inject.Typed;
+import javax.sql.DataSource;
+import java.sql.SQLException;
+
+/**
+ * This class can be used for static config. and will resolve the final implementation at runtime.
+ *
+ * @author Gerhard Petracek
+ */
+@Typed()
+public class ConfigurableDataSource extends AbstractConfigurableDataSource
+{
+    private AbstractConfigurableDataSource configurableDataSource;
+
+    /**
+     * {@inheritDoc}
+     */
+    protected DataSource resolveDataSource() throws SQLException
+    {
+        //only needed here because #configureDataSource will be called afterwards (in any case)
+        this.configurableDataSource = BeanManagerProvider.getInstance()
+                .getContextualReference(AbstractConfigurableDataSource.class);
+
+        return this.configurableDataSource.resolveDataSource();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    protected void configureDataSource(DataSource dataSource)
+    {
+        this.configurableDataSource.configureDataSource(dataSource);
+    }
+}

Modified: myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/datasource/DefaultConfigurableDataSource.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/datasource/DefaultConfigurableDataSource.java?rev=1197397&r1=1197396&r2=1197397&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/datasource/DefaultConfigurableDataSource.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jpa-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jpa/impl/datasource/DefaultConfigurableDataSource.java Fri Nov  4 03:32:18 2011
@@ -22,6 +22,7 @@ import org.apache.myfaces.extensions.cdi
 import org.apache.myfaces.extensions.cdi.core.impl.util.JndiUtils;
 import org.apache.myfaces.extensions.cdi.jpa.api.datasource.AbstractConfigurableDataSource;
 
+import javax.enterprise.context.Dependent;
 import javax.sql.DataSource;
 import java.lang.reflect.Method;
 import java.sql.SQLException;
@@ -29,6 +30,7 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+@Dependent
 public class DefaultConfigurableDataSource extends AbstractConfigurableDataSource
 {
     /**