Author: gpetracek
Date: Sat Feb 8 11:51:57 2014
New Revision: 1565971
URL: http://svn.apache.org/r1565971
Log:
OWB-930 NotificationManager#disableOverriddenObservers fixed
Added:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanA.java
- copied, changed from r1563810,
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanA.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanB.java
- copied, changed from r1563810,
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanB.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanC.java
- copied, changed from r1563810,
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanC.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanD.java
- copied, changed from r1563810,
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanD.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanE.java
- copied, changed from r1563810,
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanE.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/ProtectedObserverTest.java
- copied, changed from r1563810,
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/ObserverTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanA.java
- copied, changed from r1565970,
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanA.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanB.java
- copied, changed from r1565970,
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanB.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanC.java
- copied, changed from r1565970,
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanC.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanD.java
- copied, changed from r1565970,
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanD.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanE.java
- copied, changed from r1565970,
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanE.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/PublicObserverTest.java
- copied, changed from r1565970,
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/PublicObserverTest.java
Removed:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanA.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanB.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanC.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanD.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanE.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/ObserverTest.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/specalization/observer/AlternativeSpecializes.xml
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java?rev=1565971&r1=1565970&r2=1565971&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/NotificationManager.java
Sat Feb 8 11:51:57 2014
@@ -101,8 +101,9 @@ public final class NotificationManager
{
AnnotatedMethod<?> observerMethod =
((ObserverMethodImpl<?>)observer).getObserverMethod();
- // we only remove methods from a superclass
- if
(!observerMethod.getJavaMember().getDeclaringClass().equals(subClass))
+ //needs to be a subtype and not the class itself
(otherwise all observer-methods get removed)
+ if
(subClass.isAssignableFrom(observerMethod.getJavaMember().getDeclaringClass())
&&
+
!subClass.equals(observerMethod.getJavaMember().getDeclaringClass()))
{
try
{
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1565971&r1=1565970&r2=1565971&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Sat Feb 8 11:51:57 2014
@@ -130,8 +130,6 @@ import java.util.Set;
/**
* Contains some utility methods used in the all project.
- *
- * @version $Rev$ $Date$
*/
@SuppressWarnings("unchecked")
public final class WebBeansUtil
@@ -724,7 +722,7 @@ public final class WebBeansUtil
throw new DefinitionException("@Specialized Class : " +
specializedClass.getName()
+ " must have all bean types of its super class");
}
-
webBeansContext.getBeanManagerImpl().getNotificationManager().disableOverriddenObservers(superClass);
+
webBeansContext.getBeanManagerImpl().getNotificationManager().disableOverriddenObservers(specializedClass);
// Recursively configure super class first if super class is
also a special bean.
// So the name and bean meta data could be populated to this
beanclass.
Copied:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanA.java
(from r1563810,
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanA.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanA.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanA.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanA.java&r1=1563810&r2=1565971&rev=1565971&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanA.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanA.java
Sat Feb 8 11:51:57 2014
@@ -16,7 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.test.specalization.observer;
+package org.apache.webbeans.test.specalization.observer.prot;
+
+import org.apache.webbeans.test.specalization.observer.TestEvent;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
Copied:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanB.java
(from r1563810,
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanB.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanB.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanB.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanB.java&r1=1563810&r2=1565971&rev=1565971&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanB.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanB.java
Sat Feb 8 11:51:57 2014
@@ -16,9 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.test.specalization.observer;
+package org.apache.webbeans.test.specalization.observer.prot;
+import org.apache.webbeans.test.specalization.observer.TestEvent;
+
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Specializes;
Copied:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanC.java
(from r1563810,
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanC.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanC.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanC.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanC.java&r1=1563810&r2=1565971&rev=1565971&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanC.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanC.java
Sat Feb 8 11:51:57 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.test.specalization.observer;
+package org.apache.webbeans.test.specalization.observer.prot;
import javax.enterprise.context.ApplicationScoped;
Copied:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanD.java
(from r1563810,
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanD.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanD.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanD.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanD.java&r1=1563810&r2=1565971&rev=1565971&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanD.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanD.java
Sat Feb 8 11:51:57 2014
@@ -16,9 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.test.specalization.observer;
+package org.apache.webbeans.test.specalization.observer.prot;
+import org.apache.webbeans.test.specalization.observer.TestEvent;
+
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
import javax.enterprise.inject.Alternative;
Copied:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanE.java
(from r1563810,
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanE.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanE.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanE.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanE.java&r1=1563810&r2=1565971&rev=1565971&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/BeanE.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/BeanE.java
Sat Feb 8 11:51:57 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.test.specalization.observer;
+package org.apache.webbeans.test.specalization.observer.prot;
import javax.enterprise.context.ApplicationScoped;
Copied:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/ProtectedObserverTest.java
(from r1563810,
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/ObserverTest.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/ProtectedObserverTest.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/ProtectedObserverTest.java&p1=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/ObserverTest.java&r1=1563810&r2=1565971&rev=1565971&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/ObserverTest.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/prot/ProtectedObserverTest.java
Sat Feb 8 11:51:57 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.test.specalization.observer;
+package org.apache.webbeans.test.specalization.observer.prot;
import java.util.ArrayList;
import java.util.Collection;
@@ -25,13 +25,14 @@ import java.util.Set;
import javax.enterprise.inject.spi.Bean;
import org.apache.webbeans.test.AbstractUnitTest;
+import org.apache.webbeans.test.specalization.observer.TestEvent;
import org.junit.Assert;
import org.junit.Test;
-public class ObserverTest extends AbstractUnitTest
+public class ProtectedObserverTest extends AbstractUnitTest
{
- private static final String PACKAGE_NAME =
ObserverTest.class.getPackage().getName();
+ private static final String PACKAGE_NAME =
TestEvent.class.getPackage().getName();
@Test
public void testObserverMethodsInParentOfAlternativeAndSpecializedBeans()
Copied:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanA.java
(from r1565970,
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanA.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanA.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanA.java&p1=openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanA.java&r1=1565970&r2=1565971&rev=1565971&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanA.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanA.java
Sat Feb 8 11:51:57 2014
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.newtests.specalization.observer.pub;
+package org.apache.webbeans.test.specalization.observer.pub;
-import org.apache.webbeans.newtests.specalization.observer.TestEvent;
+import org.apache.webbeans.test.specalization.observer.TestEvent;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
Copied:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanB.java
(from r1565970,
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanB.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanB.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanB.java&p1=openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanB.java&r1=1565970&r2=1565971&rev=1565971&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanB.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanB.java
Sat Feb 8 11:51:57 2014
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.newtests.specalization.observer.pub;
+package org.apache.webbeans.test.specalization.observer.pub;
-import org.apache.webbeans.newtests.specalization.observer.TestEvent;
+import org.apache.webbeans.test.specalization.observer.TestEvent;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
Copied:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanC.java
(from r1565970,
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanC.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanC.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanC.java&p1=openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanC.java&r1=1565970&r2=1565971&rev=1565971&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanC.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanC.java
Sat Feb 8 11:51:57 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.newtests.specalization.observer.pub;
+package org.apache.webbeans.test.specalization.observer.pub;
import javax.enterprise.context.ApplicationScoped;
Copied:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanD.java
(from r1565970,
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanD.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanD.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanD.java&p1=openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanD.java&r1=1565970&r2=1565971&rev=1565971&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanD.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanD.java
Sat Feb 8 11:51:57 2014
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.newtests.specalization.observer.pub;
+package org.apache.webbeans.test.specalization.observer.pub;
-import org.apache.webbeans.newtests.specalization.observer.TestEvent;
+import org.apache.webbeans.test.specalization.observer.TestEvent;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Observes;
Copied:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanE.java
(from r1565970,
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanE.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanE.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanE.java&p1=openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanE.java&r1=1565970&r2=1565971&rev=1565971&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/BeanE.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/BeanE.java
Sat Feb 8 11:51:57 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.newtests.specalization.observer.pub;
+package org.apache.webbeans.test.specalization.observer.pub;
import javax.enterprise.context.ApplicationScoped;
Copied:
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/PublicObserverTest.java
(from r1565970,
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/PublicObserverTest.java)
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/PublicObserverTest.java?p2=openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/PublicObserverTest.java&p1=openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/PublicObserverTest.java&r1=1565970&r2=1565971&rev=1565971&view=diff
==============================================================================
---
openwebbeans/branches/owb_1.2.x/webbeans-impl/src/test/java/org/apache/webbeans/newtests/specalization/observer/pub/PublicObserverTest.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/specalization/observer/pub/PublicObserverTest.java
Sat Feb 8 11:51:57 2014
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.webbeans.newtests.specalization.observer.pub;
+package org.apache.webbeans.test.specalization.observer.pub;
-import org.apache.webbeans.newtests.AbstractUnitTest;
-import org.apache.webbeans.newtests.specalization.observer.TestEvent;
+import org.apache.webbeans.test.AbstractUnitTest;
+import org.apache.webbeans.test.specalization.observer.TestEvent;
import org.junit.Assert;
import org.junit.Test;
Modified:
openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/specalization/observer/AlternativeSpecializes.xml
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/specalization/observer/AlternativeSpecializes.xml?rev=1565971&r1=1565970&r2=1565971&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/specalization/observer/AlternativeSpecializes.xml
(original)
+++
openwebbeans/trunk/webbeans-impl/src/test/resources/org/apache/webbeans/test/specalization/observer/AlternativeSpecializes.xml
Sat Feb 8 11:51:57 2014
@@ -19,7 +19,9 @@ under the License.
-->
<beans>
<alternatives>
-
<class>org.apache.webbeans.test.specalization.observer.BeanC</class>
-
<class>org.apache.webbeans.test.specalization.observer.BeanD</class>
+
<class>org.apache.webbeans.test.specalization.observer.prot.BeanC</class>
+
<class>org.apache.webbeans.test.specalization.observer.prot.BeanD</class>
+
<class>org.apache.webbeans.test.specalization.observer.pub.BeanC</class>
+
<class>org.apache.webbeans.test.specalization.observer.pub.BeanD</class>
</alternatives>
</beans>
\ No newline at end of file
