[weld-commits] Weld SVN: r6663 - in core/branches/1.1.0-glassfish-b1: bom and 11 other directories.

Author: rogerk Date: 2010-07-16 07:12:06 -0400 (Fri, 16 Jul 2010) New Revision: 6663 Modified: core/branches/1.1.0-glassfish-b1/bom/pom.xml core/branches/1.1.0-glassfish-b1/impl/pom.xml core/branches/1.1.0-glassfish-b1/impl/src/main/java/org/jboss/weld/bean/proxy/util/SerializableProxy.java core/branches/1.1.0-glassfish-b1/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java core/branches/1.1.0-glassfish-b1/inject-tck-runner/pom.xml core/branches/1.1.0-glassfish-b1/jboss-tck-runner/pom.xml core/branches/1.1.0-glassfish-b1/osgi-bundle/pom.xml core/branches/1.1.0-glassfish-b1/parent/pom.xml core/branches/1.1.0-glassfish-b1/pom.xml core/branches/1.1.0-glassfish-b1/porting-package/pom.xml core/branches/1.1.0-glassfish-b1/tests-arquillian/pom.xml core/branches/1.1.0-glassfish-b1/tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/SwitchableCLProxyServices.java core/branches/1.1.0-glassfish-b1/tests/pom.xml core/branches/1.1.0-glassfish-b1/tests/src/main/java/org/jboss/weld/mock/cluster/SwitchableCLProxyServices.java Log: siva patches Modified: core/branches/1.1.0-glassfish-b1/bom/pom.xml =================================================================== --- core/branches/1.1.0-glassfish-b1/bom/pom.xml 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/bom/pom.xml 2010-07-16 11:12:06 UTC (rev 6663) @@ -3,7 +3,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> <packaging>pom</packaging> - <version>1.1.0-glassfish-b1</version> + <version>1.1.0-glassfish-b1-SNAPSHOT</version> <parent> <groupId>org.jboss.weld</groupId> @@ -33,7 +33,7 @@ </developers> <properties> - <weld.api.version>1.0-SNAPSHOT</weld.api.version> + <weld.api.version>1.1-SNAPSHOT</weld.api.version> <!-- Override the API and compile with more recent EL API --> <google.collections.version>1.0</google.collections.version> <javassist.version>3.11.0.GA</javassist.version> Modified: core/branches/1.1.0-glassfish-b1/impl/pom.xml =================================================================== --- core/branches/1.1.0-glassfish-b1/impl/pom.xml 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/impl/pom.xml 2010-07-16 11:12:06 UTC (rev 6663) @@ -3,7 +3,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.1.0-glassfish-b1</version> + <version>1.1.0-glassfish-b1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/branches/1.1.0-glassfish-b1/impl/src/main/java/org/jboss/weld/bean/proxy/util/SerializableProxy.java =================================================================== --- core/branches/1.1.0-glassfish-b1/impl/src/main/java/org/jboss/weld/bean/proxy/util/SerializableProxy.java 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/impl/src/main/java/org/jboss/weld/bean/proxy/util/SerializableProxy.java 2010-07-16 11:12:06 UTC (rev 6663) @@ -103,7 +103,7 @@ private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { in.defaultReadObject(); - Class<?> proxyBeanType = Container.instance().services().get(ProxyServices.class).loadProxySuperClass(proxySuperClassName); + Class<?> proxyBeanType = Container.instance().services().get(ProxyServices.class).loadBeanClass(proxySuperClassName); ArraySet<Type> proxyBeanInterfaces = loadInterfaces(); Class<?> proxyClass = null; if (proxyClassName.endsWith(ProxyFactory.PROXY_SUFFIX)) @@ -131,7 +131,7 @@ ArraySet<Type> interfaceClasses = new ArraySet<Type>(proxyInterfaces.size()); for (String interfaceName : proxyInterfaces) { - interfaceClasses.add(proxyServices.loadProxySuperClass(interfaceName)); + interfaceClasses.add(proxyServices.loadBeanClass(interfaceName)); } return interfaceClasses; } Modified: core/branches/1.1.0-glassfish-b1/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java =================================================================== --- core/branches/1.1.0-glassfish-b1/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java 2010-07-16 11:12:06 UTC (rev 6663) @@ -94,7 +94,8 @@ return new SerializableProxy(proxyObject); } - public Class<?> loadProxySuperClass(final String className) + @Override + public Class<?> loadBeanClass(final String className) { try { Modified: core/branches/1.1.0-glassfish-b1/inject-tck-runner/pom.xml =================================================================== --- core/branches/1.1.0-glassfish-b1/inject-tck-runner/pom.xml 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/inject-tck-runner/pom.xml 2010-07-16 11:12:06 UTC (rev 6663) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.1.0-glassfish-b1</version> + <version>1.1.0-glassfish-b1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/branches/1.1.0-glassfish-b1/jboss-tck-runner/pom.xml =================================================================== --- core/branches/1.1.0-glassfish-b1/jboss-tck-runner/pom.xml 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/jboss-tck-runner/pom.xml 2010-07-16 11:12:06 UTC (rev 6663) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.1.0-glassfish-b1</version> + <version>1.1.0-glassfish-b1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/branches/1.1.0-glassfish-b1/osgi-bundle/pom.xml =================================================================== --- core/branches/1.1.0-glassfish-b1/osgi-bundle/pom.xml 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/osgi-bundle/pom.xml 2010-07-16 11:12:06 UTC (rev 6663) @@ -16,7 +16,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.1.0-glassfish-b1</version> + <version>1.1.0-glassfish-b1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> @@ -78,6 +78,7 @@ org.jboss.weld.bean; org.jboss.weld.bean.builtin; org.jboss.weld.bean.proxy; + org.jboss.weld.bean.proxy.util; org.jboss.weld.*.api.*; org.jboss.weld.*.spi.*; org.jboss.weld.conversation; Modified: core/branches/1.1.0-glassfish-b1/parent/pom.xml =================================================================== --- core/branches/1.1.0-glassfish-b1/parent/pom.xml 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/parent/pom.xml 2010-07-16 11:12:06 UTC (rev 6663) @@ -7,7 +7,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-core-bom</artifactId> - <version>1.1.0-glassfish-b1</version> + <version>1.1.0-glassfish-b1-SNAPSHOT</version> <relativePath>../bom/pom.xml</relativePath> </parent> Modified: core/branches/1.1.0-glassfish-b1/pom.xml =================================================================== --- core/branches/1.1.0-glassfish-b1/pom.xml 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/pom.xml 2010-07-16 11:12:06 UTC (rev 6663) @@ -4,7 +4,7 @@ <groupId>org.jboss.weld</groupId> <artifactId>weld-core-build-aggregator</artifactId> <packaging>pom</packaging> - <version>1.1.0-glassfish-b1</version> + <version>1.1.0-glassfish-b1-SNAPSHOT</version> <parent> <groupId>org.jboss.weld</groupId> @@ -27,7 +27,7 @@ <dependency> <groupId>org.jboss.weld</groupId> <artifactId>weld-api-bom</artifactId> - <version>1.0-SNAPSHOT</version> + <version>1.1-SNAPSHOT</version> <type>pom</type> </dependency> </dependencies> Modified: core/branches/1.1.0-glassfish-b1/porting-package/pom.xml =================================================================== --- core/branches/1.1.0-glassfish-b1/porting-package/pom.xml 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/porting-package/pom.xml 2010-07-16 11:12:06 UTC (rev 6663) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.1.0-glassfish-b1</version> + <version>1.1.0-glassfish-b1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/branches/1.1.0-glassfish-b1/tests/pom.xml =================================================================== --- core/branches/1.1.0-glassfish-b1/tests/pom.xml 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/tests/pom.xml 2010-07-16 11:12:06 UTC (rev 6663) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.1.0-glassfish-b1</version> + <version>1.1.0-glassfish-b1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/branches/1.1.0-glassfish-b1/tests/src/main/java/org/jboss/weld/mock/cluster/SwitchableCLProxyServices.java =================================================================== --- core/branches/1.1.0-glassfish-b1/tests/src/main/java/org/jboss/weld/mock/cluster/SwitchableCLProxyServices.java 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/tests/src/main/java/org/jboss/weld/mock/cluster/SwitchableCLProxyServices.java 2010-07-16 11:12:06 UTC (rev 6663) @@ -44,7 +44,7 @@ } @Override - public Class<?> loadProxySuperClass(String className) + public Class<?> loadBeanClass(String className) { try { Modified: core/branches/1.1.0-glassfish-b1/tests-arquillian/pom.xml =================================================================== --- core/branches/1.1.0-glassfish-b1/tests-arquillian/pom.xml 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/tests-arquillian/pom.xml 2010-07-16 11:12:06 UTC (rev 6663) @@ -2,7 +2,7 @@ <parent> <artifactId>weld-core-parent</artifactId> <groupId>org.jboss.weld</groupId> - <version>1.1.0-glassfish-b1</version> + <version>1.1.0-glassfish-b1-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: core/branches/1.1.0-glassfish-b1/tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/SwitchableCLProxyServices.java =================================================================== --- core/branches/1.1.0-glassfish-b1/tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/SwitchableCLProxyServices.java 2010-07-16 04:17:08 UTC (rev 6662) +++ core/branches/1.1.0-glassfish-b1/tests-arquillian/src/main/java/org/jboss/weld/mock/cluster/SwitchableCLProxyServices.java 2010-07-16 11:12:06 UTC (rev 6663) @@ -44,7 +44,7 @@ } @Override - public Class<?> loadProxySuperClass(String className) + public Class<?> loadBeanClass(String className) { try {