You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by st...@apache.org on 2013/06/23 23:09:36 UTC
[1/7] git commit: DELTASPIKE-386 use correct ClassLoader for loading
the ResourceBundle
Updated Branches:
refs/heads/master 9c301fc28 -> ec592a451
DELTASPIKE-386 use correct ClassLoader for loading the ResourceBundle
txs to Richard DiCroce for the catch!
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/01b87451
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/01b87451
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/01b87451
Branch: refs/heads/master
Commit: 01b87451db42627e908f3f9c900aba9a7620f891
Parents: 9c301fc
Author: Mark Struberg <st...@apache.org>
Authored: Sun Jun 23 17:19:06 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun Jun 23 17:19:06 2013 +0200
----------------------------------------------------------------------
.../apache/deltaspike/core/util/PropertyFileUtils.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/01b87451/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java
index 80b7fc7..fabba11 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/PropertyFileUtils.java
@@ -90,13 +90,20 @@ public abstract class PropertyFileUtils
return props;
}
+ /**
+ * @return the ResourceBundle for the current default Locale
+ */
public static ResourceBundle getResourceBundle(String bundleName)
{
return getResourceBundle(bundleName, Locale.getDefault());
}
+ /**
+ * This uses the correct ThreadContextClassLoader if deployed in an Container.
+ * @return the ResourceBundle for the current Locale
+ */
public static ResourceBundle getResourceBundle(String bundleName, Locale locale)
{
- return ResourceBundle.getBundle(bundleName, locale);
+ return ResourceBundle.getBundle(bundleName, locale, ClassUtils.getClassLoader(null));
}
-}
\ No newline at end of file
+}
[4/7] git commit: remove unused private field
Posted by st...@apache.org.
remove unused private field
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/5b91442a
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/5b91442a
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/5b91442a
Branch: refs/heads/master
Commit: 5b91442a260b42e3d47ef91a53015f2d0958a683
Parents: c1cb514
Author: Mark Struberg <st...@apache.org>
Authored: Sun Jun 23 17:43:11 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun Jun 23 17:43:11 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/deltaspike/cdise/weld/ContextController.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/5b91442a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/ContextController.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/ContextController.java b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/ContextController.java
index 85f05c6..64c1df0 100644
--- a/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/ContextController.java
+++ b/deltaspike/cdictrl/impl-weld/src/main/java/org/apache/deltaspike/cdise/weld/ContextController.java
@@ -55,8 +55,6 @@ public class ContextController
private Map<String, Object> requestMap;
- private boolean applicationScopeStarted;
-
private boolean singletonScopeStarted;
void startApplicationScope()
[2/7] git commit: fix old TODO and use field injection of Extension.
Posted by st...@apache.org.
fix old TODO and use field injection of Extension.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/bba00460
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/bba00460
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/bba00460
Branch: refs/heads/master
Commit: bba004602c091dbb5c1da4b7a1d05a0ef4e55c42
Parents: 01b8745
Author: Mark Struberg <st...@apache.org>
Authored: Sun Jun 23 17:39:47 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun Jun 23 17:39:47 2013 +0200
----------------------------------------------------------------------
.../exception/control/HandlerMethodStorageProducer.java | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/bba00460/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageProducer.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageProducer.java b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageProducer.java
index 4b1ea0f..2f57435 100644
--- a/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageProducer.java
+++ b/deltaspike/core/impl/src/main/java/org/apache/deltaspike/core/impl/exception/control/HandlerMethodStorageProducer.java
@@ -18,23 +18,22 @@
*/
package org.apache.deltaspike.core.impl.exception.control;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.impl.exception.control.extension.ExceptionControlExtension;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
+import javax.inject.Inject;
@ApplicationScoped
public class HandlerMethodStorageProducer
{
+ @Inject
+ private ExceptionControlExtension exceptionControlExtension;
+
@Produces
@ApplicationScoped
protected HandlerMethodStorage createHandlerMethodStorage()
{
- //X TODO change it back to parameter injection after fixing the test-setup for ExcludeIntegrationTest
- ExceptionControlExtension exceptionControlExtension =
- BeanProvider.getContextualReference(ExceptionControlExtension.class);
-
return new HandlerMethodStorageImpl(exceptionControlExtension.getAllExceptionHandlers());
}
}
[7/7] git commit: review old TODOs and remove them if not valid
anymore.
Posted by st...@apache.org.
review old TODOs and remove them if not valid anymore.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/ec592a45
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/ec592a45
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/ec592a45
Branch: refs/heads/master
Commit: ec592a45194c1a126d861514e453ac9b7de7c5be
Parents: 2318498
Author: Mark Struberg <st...@apache.org>
Authored: Sun Jun 23 18:14:20 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun Jun 23 18:14:20 2013 +0200
----------------------------------------------------------------------
.../org/apache/deltaspike/core/util/ServiceUtils.java | 2 --
.../test/core/api/config/ConfigSourceTest.java | 13 -------------
2 files changed, 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ec592a45/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java
index a02ec3e..0c1b994 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/util/ServiceUtils.java
@@ -44,8 +44,6 @@ public abstract class ServiceUtils
if (!servicesIterator.hasNext())
{
- //X TODO check if we have to do it in any case with different packaging constellations
- //X and merge the result in any case
ClassLoader fallbackClassLoader = ServiceUtils.class.getClassLoader();
servicesIterator = ServiceLoader.load(serviceType, fallbackClassLoader).iterator();
}
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/ec592a45/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/ConfigSourceTest.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/ConfigSourceTest.java b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/ConfigSourceTest.java
index 3bbccff..79aa6ba 100644
--- a/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/ConfigSourceTest.java
+++ b/deltaspike/core/impl/src/test/java/org/apache/deltaspike/test/core/api/config/ConfigSourceTest.java
@@ -86,18 +86,5 @@ public class ConfigSourceTest
Assert.assertEquals(value, configuredValue);
}
- /*
- //X TODO discuss marker
- @Test
- public void testConfigViaSystemPropertyAndMarker()
- {
- String key = "testProperty01";
- String value = "test_value";
- System.setProperty("org.apache.deltaspike." + key, value);
- String configuredValue = ConfigResolver.getPropertyValue("@@deltaspike@@" + key);
-
- Assert.assertEquals(value, configuredValue);
- }
- */
}
[6/7] git commit: removed obsolete TODO for Weld
Posted by st...@apache.org.
removed obsolete TODO for Weld
This scenario must not happen. The ClassLoader used to load
the Extension is also the one used at shutdown. Even in EAR
scenarios with a hierarchic setup we will hopefully get the
correct TCCL. The mem will get freed up lastest after the EAR
gets undeployed anyway. Sparse re-deployments of portions of
an EAR are not guaranteed to work by the EE spec neither.
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/2318498c
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/2318498c
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/2318498c
Branch: refs/heads/master
Commit: 2318498c7712a3147bdbd8145138ab8ff91a1772
Parents: 6a3f2b4
Author: Mark Struberg <st...@apache.org>
Authored: Sun Jun 23 17:48:55 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun Jun 23 17:48:55 2013 +0200
----------------------------------------------------------------------
.../apache/deltaspike/core/api/provider/BeanManagerProvider.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/2318498c/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
index 5cb361f..3db6f3a 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/provider/BeanManagerProvider.java
@@ -242,9 +242,6 @@ public class BeanManagerProvider implements Extension
ClassLoader classLoader = ClassUtils.getClassLoader(null);
bmpSingleton.bmInfos.remove(classLoader);
-
- //X TODO this might not be enough as there might be
- //X ClassLoaders used during Weld startup which are not the TCCL...
}
/**
[3/7] git commit: remove useless TODOs
Posted by st...@apache.org.
remove useless TODOs
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/c1cb5145
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/c1cb5145
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/c1cb5145
Branch: refs/heads/master
Commit: c1cb5145202335076ae00ea1630f92ea0e0efcee
Parents: bba0046
Author: Mark Struberg <st...@apache.org>
Authored: Sun Jun 23 17:40:41 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun Jun 23 17:40:41 2013 +0200
----------------------------------------------------------------------
.../org/apache/deltaspike/cdise/owb/MockServletContext.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/c1cb5145/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
----------------------------------------------------------------------
diff --git a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
index 2aa4ceb..d661fe6 100644
--- a/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
+++ b/deltaspike/cdictrl/impl-owb/src/main/java/org/apache/deltaspike/cdise/owb/MockServletContext.java
@@ -163,17 +163,17 @@ public class MockServletContext implements ServletContext
public void log(String msg)
{
- // TODO
+ // nothing to do
}
public void log(Exception exception, String msg)
{
- // TODO
+ // nothing to do
}
public void log(String message, Throwable throwable)
{
- // TODO
+ // nothing to do
}
public void removeAttribute(String name)
[5/7] git commit: fix documentation for custom ProjectStages
Posted by st...@apache.org.
fix documentation for custom ProjectStages
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/6a3f2b45
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/6a3f2b45
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/6a3f2b45
Branch: refs/heads/master
Commit: 6a3f2b45ebe4cb529b9a209105168c81252201bb
Parents: 5b91442
Author: Mark Struberg <st...@apache.org>
Authored: Sun Jun 23 17:47:24 2013 +0200
Committer: Mark Struberg <st...@apache.org>
Committed: Sun Jun 23 17:47:24 2013 +0200
----------------------------------------------------------------------
.../deltaspike/core/api/projectstage/ProjectStage.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6a3f2b45/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
----------------------------------------------------------------------
diff --git a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
index 375c57e..4a837cb 100644
--- a/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
+++ b/deltaspike/core/api/src/main/java/org/apache/deltaspike/core/api/projectstage/ProjectStage.java
@@ -65,8 +65,8 @@ import java.util.logging.Logger;
* members into a registered {@link ProjectStageHolder} as shown in the following
* sample:</p>
* <pre>
- * package org.apache.myfaces.extensions.cdi.test.api.projectstage;
- * public class MyProjectStages implements ProjectStageHolder {
+ * package org.apache.deltaspike.test.core.api.projectstage;
+ * public class TestProjectStages implements ProjectStageHolder {
* public static final class MyOwnProjectStage extends ProjectStage {};
* public static final MyOwnProjectStage MyOwnProjectStage = new MyOwnProjectStage();
*
@@ -74,15 +74,15 @@ import java.util.logging.Logger;
* public static final MyOtherProjectStage MyOtherProjectStage = new MyOtherProjectStage();
* }
* </pre>
- * <p>For activating those projectstages, you have to register this ProjectStageHolder class
+ * <p>For activating those ProjectStages, you have to register this ProjectStageHolder class
* to get picked up via the java.util.ServiceLoader mechanism. Simply create a file
* <pre>
- * META-INF/services/org.apache.myfaces.extensions.cdi.core.api.projectstage.ProjectStageHolder
+ * META-INF/services/org.apache.deltaspike.core.api.projectstage.ProjectStageHolder
* </pre>
* which contains the fully qualified class name of custom ProjectStageHolder implementation:
* <pre>
* # this class now gets picked up by java.util.ServiceLoader
- * org.apache.myfaces.extensions.cdi.core.test.api.projectstage.MyProjectStages
+ * org.apache.deltaspike.test.core.api.projectstage.TestProjectStages
* </pre>
* </p>
* <p>You can use your own ProjectStages exactly the same way as all the ones provided