You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2010/11/30 19:31:50 UTC
svn commit: r1040677 - in
/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi:
CdiPlugin.java CdiScanner.java
Author: dblevins
Date: Tue Nov 30 18:31:49 2010
New Revision: 1040677
URL: http://svn.apache.org/viewvc?rev=1040677&view=rev
Log:
Fix compile issues with latest OWB trunk
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java?rev=1040677&r1=1040676&r2=1040677&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiPlugin.java Tue Nov 30 18:31:49 2010
@@ -132,9 +132,6 @@ public class CdiPlugin extends AbstractO
CdiResourceInjectionService injectionServices = (CdiResourceInjectionService) WebBeansFinder.getSingletonInstance("org.apache.openejb.cdi.CdiResourceInjectionService", appContext.getClassLoader());
injectionServices.clear();
- //ContextFactory cleanup
- ContextFactory.cleanUpContextFactory();
-
//Clear singleton list
WebBeansFinder.clearInstances(WebBeansUtil.getCurrentClassLoader());
Modified: openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java?rev=1040677&r1=1040676&r2=1040677&view=diff
==============================================================================
--- openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java (original)
+++ openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiScanner.java Tue Nov 30 18:31:49 2010
@@ -35,6 +35,7 @@ import org.apache.webbeans.decorator.Dec
import org.apache.webbeans.exception.WebBeansConfigurationException;
import org.apache.webbeans.inject.AlternativesManager;
import org.apache.webbeans.intercept.InterceptorsManager;
+import org.apache.webbeans.spi.BDABeansXmlScanner;
import org.apache.webbeans.spi.ScannerService;
import org.apache.webbeans.util.AnnotationUtil;
@@ -102,13 +103,13 @@ public class CdiScanner implements Scann
for (String className : beans.alternativeStereotypes) {
Class<?> clazz = load(className, "alternative-stereotype", classLoader);
- alternativesManager.addStereoTypeAlternative(clazz);
+ alternativesManager.addStereoTypeAlternative(clazz, null, null);
classes.add(clazz);
}
for (String className : beans.alternativeClasses) {
Class<?> clazz = load(className, "alternative-class", classLoader);
- alternativesManager.addClazzAlternative(clazz);
+ alternativesManager.addClazzAlternative(clazz, null, null);
classes.add(clazz);
}
@@ -121,6 +122,14 @@ public class CdiScanner implements Scann
}
+ public boolean isBDABeansXmlScanningEnabled() {
+ return false;
+ }
+
+ public BDABeansXmlScanner getBDABeansXmlScanner() {
+ return null;
+ }
+
private Class load(String className, String type, ClassLoader classLoader) {
// System.out.println("cdi.load = " + className);
try {
Nice tools (was Re: svn commit: r1040677)
Posted by David Blevins <da...@visi.com>.
On Dec 1, 2010, at 12:25 AM, Jacek Laskowski wrote:
> On Tue, Nov 30, 2010 at 7:31 PM, <db...@apache.org> wrote:
>> Author: dblevins
>> Date: Tue Nov 30 18:31:49 2010
>> New Revision: 1040677
>>
>> URL: http://svn.apache.org/viewvc?rev=1040677&view=rev
>> Log:
>> Fix compile issues with latest OWB trunk
>
> I updated the code yesterday (after a longer break) and it broke with
> the error. I've been wondering how it slipped through the net? Thanks
> for the fix.
Seems it was just that the OWB snapshot was updated and had some added/changed/removed methods.
> BTW, what's your dev environment IDE-wise? Do you use IDEA on Mac?
> Anything else that might be of help and is not a common knowledge?
Yep, IDEA and mac.
Love bash. Frequently use it to automate common tasks. Best resource for that, http://tldp.org/LDP/abs/html/.
Think I would die without 'sort' and 'uniq'. Frequently use 'perl -i -pe' to scrub files. Or plain 'perl -pe' instead of 'sed' -- perl is just better all around. On the mac you can manipulate the clipboard with pbcopy/pbpaste -- love those. The 'ack' command line tool is pretty good. Nothing like 'cut -c 2-' to scrape off the first character of 'svn status'.
Emacs is very convenient for exploring jar files -- try it, it's pretty cool.
On occasion I'll whip out a bit of bash/perl to generate some code.
basic bash template https://gist.github.com/727267
basic perl template https://gist.github.com/727271
Was relying pretty heavily on this script, but it broke recently. Probably easy to fix, just haven't had the time:
https://github.com/dblevins/gistpaste
Those are some of my random tidbits.
-David
Re: svn commit: r1040677 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/cdi:
CdiPlugin.java CdiScanner.java
Posted by Jacek Laskowski <ja...@laskowski.net.pl>.
On Tue, Nov 30, 2010 at 7:31 PM, <db...@apache.org> wrote:
> Author: dblevins
> Date: Tue Nov 30 18:31:49 2010
> New Revision: 1040677
>
> URL: http://svn.apache.org/viewvc?rev=1040677&view=rev
> Log:
> Fix compile issues with latest OWB trunk
I updated the code yesterday (after a longer break) and it broke with
the error. I've been wondering how it slipped through the net? Thanks
for the fix.
BTW, what's your dev environment IDE-wise? Do you use IDEA on Mac?
Anything else that might be of help and is not a common knowledge?
Jacek
--
Jacek Laskowski
Notatnik Projektanta Java EE - http://jaceklaskowski.pl