May 2010 - weld-commits - Jboss List Archives

Weld SVN: r6272 - in cdi-tck/branches/1.0/impl/src/main: resources and 1 other directory.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-05-21 16:50:19 -0400 (Fri, 21 May 2010) New Revision: 6272 Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml Log: CDITCK-163 Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java 2010-05-21 19:23:09 UTC (rev 6271) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/IntrospectSession.java 2010-05-21 20:50:19 UTC (rev 6272) @@ -41,7 +41,7 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { resp.setContentType("text/text"); - resp.getWriter().print(aBean.hashCode()); + resp.getWriter().print(aBean.getTimestamp()); } } Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java 2010-05-21 19:23:09 UTC (rev 6271) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/context/session/SimpleSessionBean.java 2010-05-21 20:50:19 UTC (rev 6272) @@ -27,7 +27,18 @@ private static final long serialVersionUID = 1L; private static boolean beanDestroyed = false; + private final long timestamp; + public SimpleSessionBean() + { + this.timestamp = System.currentTimeMillis(); + } + + public long getTimestamp() + { + return timestamp; + } + @PreDestroy public void destroyBean() { Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml 2010-05-21 19:23:09 UTC (rev 6271) +++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml 2010-05-21 20:50:19 UTC (rev 6272) @@ -183,6 +183,14 @@ <exclude name="testPassivatingResource" /> </methods> </class> + +  + <class name="org.jboss.jsr299.tck.tests.context.session.SessionContextTest"> + <methods> + <exclude name="testSessionContextDestroyedWhenHttpSessionInvalidated" /> + <exclude name="testSessionContextDestroyedWhenHttpSessionTimesOut" /> + </methods> + </class>

13 years, 11 months

1
0
0 / 0

Weld SVN: r6271 - in cdi-tck/branches/1.0/impl/src/main: java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource and 1 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-05-21 15:23:09 -0400 (Fri, 21 May 2010) New Revision: 6271 Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml Log: CDITCK-162 Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2010-05-21 19:10:11 UTC (rev 6270) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/enterprise/lifecycle/EnterpriseBeanLifecycleTest.java 2010-05-21 19:23:09 UTC (rev 6271) @@ -85,6 +85,8 @@ // Verify that the instance returned is a proxy by checking for all local interfaces assert getCurrentConfiguration().getBeans().isProxy(stadtInstance); Set<Class> interfaces = new HashSet<Class>(Arrays.asList(stadtInstance.getClass().getInterfaces())); + Class c = stadtInstance.getClass(); + Class[] cs = c.getInterfaces(); assert interfaces.contains(KleinStadt.class); assert interfaces.contains(SchoeneStadt.class); assert interfaces.contains(Serializable.class); Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2010-05-21 19:10:11 UTC (rev 6270) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/simple/resource/resource/InjectionOfResourceTest.java 2010-05-21 19:23:09 UTC (rev 6271) @@ -47,7 +47,6 @@ CreationalContext<ManagedBean> managedBeanCc = getCurrentManager().createCreationalContext(managedBeanBean); ManagedBean managedBean = managedBeanBean.create(managedBeanCc); assert managedBean.getBeanManager() != null : "@Another Manager not found"; - assert managedBean.getBeanManager().equals(getCurrentManager()): "Wrong manager found"; } @Test(groups = { "beanLifecycle", "commonsAnnotations", "integration" }) @@ -62,7 +61,6 @@ CreationalContext<BeanManager> beanManagerCc = getCurrentManager().createCreationalContext(beanManagerBean); BeanManager beanManager = beanManagerBean.create(beanManagerCc); assert beanManager != null; - assert beanManager.equals(getCurrentManager()); } @Test(groups = { "beanLifecycle", "commonsAnnotations", "integration" }) Modified: cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml =================================================================== --- cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml 2010-05-21 19:10:11 UTC (rev 6270) +++ cdi-tck/branches/1.0/impl/src/main/resources/tck-tests-released.xml 2010-05-21 19:23:09 UTC (rev 6271) @@ -175,8 +175,15 @@ <exclude name="testConstructorAnnotatedInjectCalled" /> </methods> </class> + +  + <class name="org.jboss.jsr299.tck.tests.implementation.simple.resource.resource.InjectionOfResourceTest"> + <methods> + <exclude name="testInjectionOfResource" /> + <exclude name="testPassivatingResource" /> + </methods> + </class> -

13 years, 11 months

1
0
0 / 0

Weld SVN: r6270 - in core/trunk/impl/src/main/java/org/jboss/weld/bean: proxy and 1 other directory.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-05-21 15:10:11 -0400 (Fri, 21 May 2010) New Revision: 6270 Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseProxyFactory.java Log: add all business interfaces explictly Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java 2010-05-21 19:09:02 UTC (rev 6269) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/SessionBean.java 2010-05-21 19:10:11 UTC (rev 6270) @@ -245,7 +245,7 @@ protected void initProxyClass() { - this.proxyClass = new EnterpriseProxyFactory<T>(getWeldAnnotated().getJavaClass()).getProxyClass(); + this.proxyClass = new EnterpriseProxyFactory<T>(getWeldAnnotated().getJavaClass(), getTypes()).getProxyClass(); } /** Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseProxyFactory.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseProxyFactory.java 2010-05-21 19:09:02 UTC (rev 6269) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/EnterpriseProxyFactory.java 2010-05-21 19:10:11 UTC (rev 6270) @@ -17,13 +17,15 @@ package org.jboss.weld.bean.proxy; +import java.lang.reflect.Type; +import java.util.Set; + import javassist.CtClass; -import javassist.CtConstructor; import javassist.CtMethod; -import javassist.CtNewConstructor; import javassist.CtNewMethod; import org.jboss.weld.exceptions.WeldException; +import org.jboss.weld.util.reflection.Reflections; /** * This factory produces proxies specific for enterprise beans, in particular @@ -41,9 +43,18 @@ * * @param proxiedBeanType the actual enterprise bean */ - public EnterpriseProxyFactory(Class<T> proxiedBeanType) + public EnterpriseProxyFactory(Class<T> proxiedBeanType, Set<Type> localBusinessInterfaces) { super(proxiedBeanType); + for (Type type : localBusinessInterfaces) + { + Class<?> c = Reflections.getRawType(type); + // Ignore no-interface views, they are dealt with proxiedBeanType (pending redesign) + if (c.isInterface()) + { + addInterface(c); + } + } } @Override

13 years, 11 months

1
0
0 / 0

Weld SVN: r6269 - in core/trunk/tests/src/test: resources/org/jboss/testharness/impl/packaging/ear and 1 other directory.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-05-21 15:09:02 -0400 (Fri, 21 May 2010) New Revision: 6269 Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java core/trunk/tests/src/test/resources/org/jboss/testharness/impl/packaging/ear/ejb-jar.xml Log: mark test broken Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java 2010-05-21 16:48:54 UTC (rev 6268) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java 2010-05-21 19:09:02 UTC (rev 6269) @@ -28,10 +28,11 @@ public class EnterpriseBeanProxyTest extends AbstractWeldTest { - /** + /* * <a href="https://jira.jboss.org/jira/browse/WBRI-109">WBRI-109</a> */ - @Test(description="WBRI-109") + // Broken due to WELDINT-45 + @Test(description="WBRI-109", groups = "broken") public void testNoInterfaceView() throws Exception { Object mouse = getReference(Mouse.class); Modified: core/trunk/tests/src/test/resources/org/jboss/testharness/impl/packaging/ear/ejb-jar.xml =================================================================== --- core/trunk/tests/src/test/resources/org/jboss/testharness/impl/packaging/ear/ejb-jar.xml 2010-05-21 16:48:54 UTC (rev 6268) +++ core/trunk/tests/src/test/resources/org/jboss/testharness/impl/packaging/ear/ejb-jar.xml 2010-05-21 19:09:02 UTC (rev 6269) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd" - version="3.0"> + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_1.xsd" + version="3.1"> </ejb-jar>

13 years, 11 months

1
0
0 / 0

Weld SVN: r6268 - in core/tags/1.0.1-SP3: bom and 7 other directories.

by weld-commits＠lists.jboss.org

Author: rogerk Date: 2010-05-21 12:48:54 -0400 (Fri, 21 May 2010) New Revision: 6268 Modified: core/tags/1.0.1-SP3/bom/pom.xml core/tags/1.0.1-SP3/impl/pom.xml core/tags/1.0.1-SP3/inject-tck-runner/pom.xml core/tags/1.0.1-SP3/jboss-tck-runner/pom.xml core/tags/1.0.1-SP3/osgi-bundle/pom.xml core/tags/1.0.1-SP3/parent/pom.xml core/tags/1.0.1-SP3/pom.xml core/tags/1.0.1-SP3/porting-package/pom.xml core/tags/1.0.1-SP3/tests/pom.xml Log: changes for 1.0.1 SP3 Modified: core/tags/1.0.1-SP3/bom/pom.xml =================================================================== --- core/tags/1.0.1-SP3/bom/pom.xml 2010-05-20 21:58:59 UTC (rev 6267) +++ core/tags/1.0.1-SP3/bom/pom.xml 2010-05-21 16:48:54 UTC (rev 6268) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> <packaging>pom</packaging> - <version>1.0.1-SP2</version> + <version>1.0.1-SP3</version> <parent> <groupId>org.jboss.weld</groupId> @@ -137,9 +137,9 @@  <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/bom</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP2/bom</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/bom</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/bom</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/bom</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/bom</url> </scm> </project> Modified: core/tags/1.0.1-SP3/impl/pom.xml =================================================================== --- core/tags/1.0.1-SP3/impl/pom.xml 2010-05-20 21:58:59 UTC (rev 6267) +++ core/tags/1.0.1-SP3/impl/pom.xml 2010-05-21 16:48:54 UTC (rev 6268) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-SP2</version> + <version>1.0.1-SP3</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -178,9 +178,9 @@ </profiles> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/impl</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP2/impl</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/impl</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/impl</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/impl</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/impl</url> </scm> </project> Modified: core/tags/1.0.1-SP3/inject-tck-runner/pom.xml =================================================================== --- core/tags/1.0.1-SP3/inject-tck-runner/pom.xml 2010-05-20 21:58:59 UTC (rev 6267) +++ core/tags/1.0.1-SP3/inject-tck-runner/pom.xml 2010-05-21 16:48:54 UTC (rev 6268) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-SP2</version> + <version>1.0.1-SP3</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -87,9 +87,9 @@ </build> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/inject-tck-r...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP2/inject-t...</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/inject-tck-runner</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/inject-tck-r...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/inject-tck-r...</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/inject-tck-runner</url> </scm> </project> Modified: core/tags/1.0.1-SP3/jboss-tck-runner/pom.xml =================================================================== --- core/tags/1.0.1-SP3/jboss-tck-runner/pom.xml 2010-05-20 21:58:59 UTC (rev 6267) +++ core/tags/1.0.1-SP3/jboss-tck-runner/pom.xml 2010-05-21 16:48:54 UTC (rev 6268) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-SP2</version> + <version>1.0.1-SP3</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -314,9 +314,9 @@ </profiles> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/jboss-tck-ru...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP2/jboss-tc...</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/jboss-tck-runner</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/jboss-tck-ru...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/jboss-tck-ru...</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/jboss-tck-runner</url> </scm> </project> Modified: core/tags/1.0.1-SP3/osgi-bundle/pom.xml =================================================================== --- core/tags/1.0.1-SP3/osgi-bundle/pom.xml 2010-05-20 21:58:59 UTC (rev 6267) +++ core/tags/1.0.1-SP3/osgi-bundle/pom.xml 2010-05-21 16:48:54 UTC (rev 6268) @@ -16,7 +16,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-SP2</version> + <version>1.0.1-SP3</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -199,9 +199,9 @@ </dependencies> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/osgi-bundle</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP2/osgi-bundle</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/osgi-bundle</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/osgi-bundle</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/osgi-bundle</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/osgi-bundle</url> </scm> </project> Modified: core/tags/1.0.1-SP3/parent/pom.xml =================================================================== --- core/tags/1.0.1-SP3/parent/pom.xml 2010-05-20 21:58:59 UTC (rev 6267) +++ core/tags/1.0.1-SP3/parent/pom.xml 2010-05-21 16:48:54 UTC (rev 6268) @@ -7,7 +7,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> - <version>1.0.1-SP2</version> + <version>1.0.1-SP3</version> <relativePath>../bom</relativePath> </parent> @@ -171,9 +171,9 @@ </dependencyManagement> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/parent</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP2/parent</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/parent</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/parent</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/parent</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/parent</url> </scm> </project> Modified: core/tags/1.0.1-SP3/pom.xml =================================================================== --- core/tags/1.0.1-SP3/pom.xml 2010-05-20 21:58:59 UTC (rev 6267) +++ core/tags/1.0.1-SP3/pom.xml 2010-05-21 16:48:54 UTC (rev 6268) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-build-aggregator</artifactId> <packaging>pom</packaging> - <version>1.0.1-SP2</version> + <version>1.0.1-SP3</version> <parent> <groupId>org.jboss.weld</groupId> @@ -23,9 +23,9 @@  <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP2</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3</url> </scm> <profiles> Modified: core/tags/1.0.1-SP3/porting-package/pom.xml =================================================================== --- core/tags/1.0.1-SP3/porting-package/pom.xml 2010-05-20 21:58:59 UTC (rev 6267) +++ core/tags/1.0.1-SP3/porting-package/pom.xml 2010-05-21 16:48:54 UTC (rev 6268) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-SP2</version> + <version>1.0.1-SP3</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -55,9 +55,9 @@ </dependencies> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/porting-package</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP2/porting-...</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/porting-package</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/porting-package</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/porting-package</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/porting-package</url> </scm> </project> Modified: core/tags/1.0.1-SP3/tests/pom.xml =================================================================== --- core/tags/1.0.1-SP3/tests/pom.xml 2010-05-20 21:58:59 UTC (rev 6267) +++ core/tags/1.0.1-SP3/tests/pom.xml 2010-05-21 16:48:54 UTC (rev 6268) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.0.1-SP2</version> + <version>1.0.1-SP3</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -284,9 +284,9 @@ </profiles> <scm> - <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/tests</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/branches/1.0.1-SP2/tests</developerConnection> - <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP2/tests</url> + <connection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/tests</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/tests</developerConnection> + <url>https://svn.jboss.org/repos/weld/core/tags/1.0.1-SP3/tests</url> </scm> </project>

13 years, 11 months

1
0
0 / 0

Weld SVN: r6267 - core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-05-20 17:58:59 -0400 (Thu, 20 May 2010) New Revision: 6267 Removed: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/MouseLocal.java Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java Log: Test should do what it says Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java 2010-05-20 20:11:45 UTC (rev 6266) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/EnterpriseBeanProxyTest.java 2010-05-20 21:58:59 UTC (rev 6267) @@ -16,8 +16,6 @@ */ package org.jboss.weld.tests.proxy.enterprise; -import javassist.util.proxy.ProxyObject; - import org.jboss.testharness.impl.packaging.Artifact; import org.jboss.testharness.impl.packaging.Packaging; import org.jboss.testharness.impl.packaging.PackagingType; @@ -36,9 +34,9 @@ @Test(description="WBRI-109") public void testNoInterfaceView() throws Exception { - Object mouse = getReference(MouseLocal.class); + Object mouse = getReference(Mouse.class); assert Utils.isProxy(mouse); - assert mouse instanceof MouseLocal; + assert mouse instanceof Mouse; } } Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java 2010-05-20 20:11:45 UTC (rev 6266) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/Mouse.java 2010-05-20 21:58:59 UTC (rev 6267) @@ -19,7 +19,7 @@ import javax.ejb.Stateless; @Stateless -public class Mouse implements MouseLocal +public class Mouse { } Deleted: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/MouseLocal.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/MouseLocal.java 2010-05-20 20:11:45 UTC (rev 6266) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/enterprise/MouseLocal.java 2010-05-20 21:58:59 UTC (rev 6267) @@ -1,25 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2010, Red Hat, Inc., and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed 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.jboss.weld.tests.proxy.enterprise; - -import javax.ejb.Local; - -@Local -public interface MouseLocal -{ - -}

13 years, 11 months

1
0
0 / 0

Weld SVN: r6266 - core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-05-20 16:11:45 -0400 (Thu, 20 May 2010) New Revision: 6266 Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java Log: revert simple proxy services to be symmetric Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java 2010-05-20 20:11:12 UTC (rev 6265) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java 2010-05-20 20:11:45 UTC (rev 6266) @@ -38,28 +38,38 @@ public class SimpleProxyServices implements ProxyServices { - public ClassLoader getClassLoader(Class<?> type) + public ClassLoader getClassLoader(final Class<?> type) { SecurityManager sm = System.getSecurityManager(); - if (sm != null) { - return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() { - public ClassLoader run() { - return Thread.currentThread().getContextClassLoader(); - } - }); - } else { - return Thread.currentThread().getContextClassLoader(); + if (sm != null) + { + return AccessController.doPrivileged(new PrivilegedAction<ClassLoader>() + { + public ClassLoader run() + { + return _getClassLoader(type); + } + }); } -// if (type.getName().startsWith("java")) -// { -// return this.getClass().getClassLoader(); -// } -// else -// { -// return type.getClassLoader(); -// } + else + { + return _getClassLoader(type); + } } + private ClassLoader _getClassLoader(Class<?> type) + { + // return Thread.currentThread().getContextClassLoader(); + if (type.getName().startsWith("java")) + { + return this.getClass().getClassLoader(); + } + else + { + return type.getClassLoader(); + } + } + public ProtectionDomain getProtectionDomain(Class<?> type) { if (type.getName().startsWith("java")) @@ -92,7 +102,8 @@ { public Object run() throws Exception { - //ClassLoader cl = Thread.currentThread().getContextClassLoader(); + // ClassLoader cl = + // Thread.currentThread().getContextClassLoader(); ClassLoader cl = getClassLoader(this.getClass()); return Class.forName(className, true, cl); }

13 years, 11 months

1
0
0 / 0

Weld SVN: r6265 - core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-05-20 16:11:12 -0400 (Thu, 20 May 2010) New Revision: 6265 Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java Log: reenable unsafe instantiators Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java 2010-05-20 20:10:32 UTC (rev 6264) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ProxyFactory.java 2010-05-20 20:11:12 UTC (rev 6265) @@ -47,6 +47,8 @@ import org.jboss.weld.exceptions.DefinitionException; import org.jboss.weld.exceptions.WeldException; import org.jboss.weld.serialization.spi.ProxyServices; +import org.jboss.weld.util.reflection.SecureReflections; +import org.jboss.weld.util.reflection.instantiation.InstantiatorFactory; import org.slf4j.cal10n.LocLogger; /** @@ -89,6 +91,7 @@ public ProxyFactory(Class<?> proxiedBeanType) { this.beanType = proxiedBeanType; + ClassLoader originalClassLoader = proxiedBeanType.getClassLoader(); this.classLoader = Container.instance().services().get(ProxyServices.class).getClassLoader(beanType); this.protectionDomain = Container.instance().services().get(ProxyServices.class).getProtectionDomain(beanType); this.classPool = new ClassPool(); @@ -122,7 +125,14 @@ Class<T> proxyClass = getProxyClass(); try { - proxy = proxyClass.newInstance(); + if (InstantiatorFactory.useInstantiators()) + { + proxy = SecureReflections.newUnsafeInstance(proxyClass); + } + else + { + proxy = SecureReflections.newInstance(proxyClass); + } } catch (InstantiationException e) {

13 years, 11 months

1
0
0 / 0

Weld SVN: r6264 - core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-05-20 16:10:32 -0400 (Thu, 20 May 2010) New Revision: 6264 Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java Log: minor Modified: core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java =================================================================== --- core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java 2010-05-20 18:46:38 UTC (rev 6263) +++ core/trunk/tests/src/test/java/org/jboss/weld/tests/proxy/ProxyTest.java 2010-05-20 20:10:32 UTC (rev 6264) @@ -30,7 +30,7 @@ public void testImplementationClassImplementsSerializable() { Bean<?> bean = getCurrentManager().resolve(getCurrentManager().getBeans("foo")); - getCurrentManager().getReference(bean, Object.class, getCurrentManager().createCreationalContext(bean)); + assert getCurrentManager().getReference(bean, Object.class, getCurrentManager().createCreationalContext(bean)) != null; } }

13 years, 11 months

1
0
0 / 0

Weld SVN: r6263 - cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2010-05-20 14:46:38 -0400 (Thu, 20 May 2010) New Revision: 6263 Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java Log: CDITCK-153 Modified: cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java =================================================================== --- cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java 2010-05-20 18:39:54 UTC (rev 6262) +++ cdi-tck/branches/1.0/impl/src/main/java/org/jboss/jsr299/tck/tests/implementation/producer/method/definition/enterprise/AndalusianChicken.java 2010-05-20 18:46:38 UTC (rev 6263) @@ -21,7 +21,7 @@ @Stateful @Specializes -public class AndalusianChicken extends Chicken implements AndalusianChickenLocal +public class AndalusianChicken extends Chicken implements AndalusianChickenLocal, ChickenLocal { }

13 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits May 2010