Author: shane.bryzak(a)jboss.com Date: 2009-10-08 01:29:40 -0400 (Thu, 08 Oct 2009) New Revision: 3892 Modified: ri/trunk/dist/build.xml ri/trunk/dist/pom.xml ri/trunk/embedded-tck-runner/pom.xml ri/trunk/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java ri/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyProvider.java ri/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java ri/trunk/impl/src/main/java/org/jboss/weld/conversation/JavaSEConversationTerminator.java ri/trunk/inject-tck-runner/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension ri/trunk/inject-tck-runner/src/test/resources/log4j.xml ri/trunk/inject-tck-runner/tests.xml ri/trunk/jboss-as/build.xml ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml ri/trunk/logging/src/test/java/org/jboss/weld/test/log/LoggingTest.java ri/trunk/logging/src/test/resources/log4j.xml ri/trunk/porting-package/src/main/resources/META-INF/jboss-test-harness.properties ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/helpers/AbstractResourceServices.java ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java ri/trunk/tests/src/main/resources/META-INF/jboss-test-harness.properties ri/trunk/tests/unit-tests.xml Log: bunch of miscellaneous name changes Modified: ri/trunk/dist/build.xml =================================================================== --- ri/trunk/dist/build.xml 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/dist/build.xml 2009-10-08 05:29:40 UTC (rev 3892) @@ -1,42 +1,42 @@ <?xml version="1.0"?> <project name="DistributionBuilder" default="dist" basedir="." xmlns:artifact="urn:maven-artifact-ant"> - <property name="wbri.dir" location="${ant.file.DistributionBuilder}/../../" /> + <property name="weld.dir" location="${ant.file.DistributionBuilder}/../../" /> - <path id="maven-ant-tasks.classpath" path="${wbri.dir}/lib/maven-ant-tasks.jar" /> + <path id="maven-ant-tasks.classpath" path="${weld.dir}/lib/maven-ant-tasks.jar" /> <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath" /> <property file="versions.properties" /> - <property name="maven.dir" location="${wbri.dir}/lib/maven" /> + <property name="maven.dir" location="${weld.dir}/lib/maven" /> - <property name="dist.dir" value="${wbri.dir}/dist/webbeans-${webbeans.version}" /> - <property name="dist.wb.lib.dir" value="${dist.dir}/lib/webbeans" /> + <property name="dist.dir" value="${weld.dir}/dist/weld-${weld.version}" /> + <property name="dist.wb.lib.dir" value="${dist.dir}/lib/weld" /> <property name="dist.doc.dir" value="${dist.dir}/doc" /> <property name="dist.apidocs.dir" value="${dist.dir}/doc/apidocs" /> <target name="dist" description="Build the distribution"> - <fail unless="webbeans.version" message="You must specify the webbeans.version as a property" /> + <fail unless="weld.version" message="You must specify the weld.version as a property" /> <fail unless="jsr299.version" message="You must specify the jsr299.version as a property" /> - <fail unless="webbeans.servlet.version" message="You must specify the webbeans.servlet.version as a property" /> - <fail unless="webbeans.se.version" message="You must specify the webbeans.se.version as a property" /> - <fail unless="webbeans.wicket.version" message="You must specify the webbeans.wicket.version as a property" /> - <fail unless="webbeans.logger.version" message="You must specify the webbeans.logger.version as a property" /> + <fail unless="weld.servlet.version" message="You must specify the weld.servlet.version as a property" /> + <fail unless="weld.se.version" message="You must specify the weld.se.version as a property" /> + <fail unless="weld.wicket.version" message="You must specify the weld.wicket.version as a property" /> + <fail unless="weld.logger.version" message="You must specify the weld.logger.version as a property" /> <fail unless="refdoc.dir" message="You must specify the reference docs directory with -Drefdoc.dir=~/workspace/wb/reference" /> <fail unless="examples.dir" message="You must specify the examples directory with -Dexamples.dir=~/workspace/wb/examples" /> - <maven target="clean" basedir="${wbri.dir}" /> + <maven target="clean" basedir="${weld.dir}" /> <maven target="clean" basedir="${refdoc.dir}" /> <maven target="clean" basedir="${examples.dir}" /> - <delete dir="${wbri.dir}/jboss-as/target" /> - <delete dir="${wbri.dir}/impl/test-output" /> - <delete dir="${wbri.dir}/impl/ObjectStore" /> + <delete dir="${weld.dir}/jboss-as/target" /> + <delete dir="${weld.dir}/impl/test-output" /> + <delete dir="${weld.dir}/impl/ObjectStore" /> <delete dir="${dist.dir}" failonerror="false"/> <mkdir dir="${dist.dir}"/> <copy todir="${dist.dir}"> - <fileset dir="${wbri.dir}"> + <fileset dir="${weld.dir}"> <include name="jboss-as/**"/> <include name="lib/**"/> <include name="readme.txt"/> @@ -67,27 +67,27 @@ </copy> <maven target="clean" basedir="${refdoc.dir}" /> - <artifact:dependencies filesetId="webbeans.fileset" versionsId="webbeans.versions" sourcesfilesetid="webbeans.sources.fileset" javadocfilesetid="webbeans.javadocs.fileset"> - <dependency groupId="org.jboss.webbeans" artifactId="jsr299-api" version="${jsr299.version}"/> - <dependency groupId="org.jboss.webbeans" artifactId="webbeans-core" version="${webbeans.version}"/> - <dependency groupId="org.jboss.webbeans" artifactId="webbeans-spi" version="${webbeans.version}"/> - <dependency groupId="org.jboss.webbeans" artifactId="webbeans-logger" version="${webbeans.logger.version}"/> - <dependency groupId="org.jboss.webbeans" artifactId="webbeans-wicket" version="${webbeans.wicket.version}"/> - <dependency groupId="org.jboss.webbeans" artifactId="webbeans-se" version="${webbeans.se.version}"/> - <dependency groupId="org.jboss.webbeans.servlet" artifactId="webbeans-servlet" version="${webbeans.servlet.version}"/> - <dependency groupId="org.jboss.webbeans.servlet" artifactId="webbeans-servlet-int" version="${webbeans.servlet.version}"/> - <dependency groupId="org.jboss.webbeans.servlet" artifactId="webbeans-tomcat-support" version="${webbeans.servlet.version}"/> + <artifact:dependencies filesetId="weld.fileset" versionsId="weld.versions" sourcesfilesetid="weld.sources.fileset" javadocfilesetid="weld.javadocs.fileset"> + <dependency groupId="org.jboss.weld" artifactId="jsr299-api" version="${jsr299.version}"/> + <dependency groupId="org.jboss.weld" artifactId="weld-core" version="${weld.version}"/> + <dependency groupId="org.jboss.weld" artifactId="weld-spi" version="${weld.version}"/> + <dependency groupId="org.jboss.weld" artifactId="weld-logger" version="${weld.logger.version}"/> + <dependency groupId="org.jboss.weld" artifactId="weld-wicket" version="${weld.wicket.version}"/> + <dependency groupId="org.jboss.weld" artifactId="weld-se" version="${weld.se.version}"/> + <dependency groupId="org.jboss.weld.servlet" artifactId="weld-servlet" version="${weld.servlet.version}"/> + <dependency groupId="org.jboss.weld.servlet" artifactId="weld-servlet-int" version="${weld.servlet.version}"/> + <dependency groupId="org.jboss.weld.servlet" artifactId="weld-tomcat-support" version="${weld.servlet.version}"/> <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" /> </artifact:dependencies> <delete dir="target" failonerror="false"/> <mkdir dir="target" /> <copy todir="target"> - <fileset refid="webbeans.fileset"/> - <fileset refid="webbeans.sources.fileset"/> - <fileset refid="webbeans.javadocs.fileset"/> + <fileset refid="weld.fileset"/> + <fileset refid="weld.sources.fileset"/> + <fileset refid="weld.javadocs.fileset"/> <chainedmapper> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${webbeans.versions}" to="flatten" /> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${weld.versions}" to="flatten" /> <flattenmapper /> </chainedmapper> </copy> @@ -96,7 +96,7 @@ <unzip dest="${dist.apidocs.dir}"> <fileset dir="target"> <include name="jsr299-api-javadoc.jar"/> - <include name="webbeans-api-javadoc.jar"/> + <include name="weld-api-javadoc.jar"/> </fileset> </unzip> @@ -104,25 +104,25 @@ <copy todir="${dist.wb.lib.dir}"> <fileset dir="target"> - <include name="webbeans-*.jar" /> + <include name="weld-*.jar" /> <include name="jsr299-api*.jar" /> </fileset> </copy> <delete dir="target" failonerror="false"/> - <zip destfile="webbeans-${webbeans.version}.zip"> - <fileset dir="${wbri.dir}/dist"> - <include name="webbeans-${webbeans.version}/**" /> + <zip destfile="weld-${weld.version}.zip"> + <fileset dir="${weld.dir}/dist"> + <include name="weld-${weld.version}/**" /> </fileset> </zip> </target> <target name="deploy-dist" depends="dist"> - <maven target="deploy:deploy-file" basedir="${wbri.dir}"> + <maven target="deploy:deploy-file" basedir="${weld.dir}"> <arg line="-DpomFile=${basedir}/pom.xml" /> <arg line="-Dpackaging=zip" /> - <arg line="-Dversion=${webbeans.version}" /> - <arg line="-Dfile=${basedir}/webbeans-${webbeans.version}.zip" /> + <arg line="-Dversion=${weld.version}" /> + <arg line="-Dfile=${basedir}/weld-${weld.version}.zip" /> <arg line="-Durl=dav:https://snapshots.jboss.org/maven2" /> <arg line="-DrepositoryId=snapshots.jboss.org" /> <arg line="-DuniqueVersion=false" /> Modified: ri/trunk/dist/pom.xml =================================================================== --- ri/trunk/dist/pom.xml 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/dist/pom.xml 2009-10-08 05:29:40 UTC (rev 3892) @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>webbeans-parent</artifactId> - <groupId>org.jboss.webbeans</groupId> + <artifactId>weld-parent</artifactId> + <groupId>org.jboss.weld</groupId> <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-distribution</artifactId> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-distribution</artifactId> <packaging>zip</packaging> - <name>Web Beans Distribution</name> + <name>Weld Distribution</name> </project> Modified: ri/trunk/embedded-tck-runner/pom.xml =================================================================== --- ri/trunk/embedded-tck-runner/pom.xml 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/embedded-tck-runner/pom.xml 2009-10-08 05:29:40 UTC (rev 3892) @@ -1,30 +1,30 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <parent> - <artifactId>webbeans-parent</artifactId> - <groupId>org.jboss.webbeans</groupId> + <artifactId>weld-parent</artifactId> + <groupId>org.jboss.weld</groupId> <version>1.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-embedded-tck-runner</artifactId> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-embedded-tck-runner</artifactId> <name>CDI TCK runner for JBoss Emebedded</name> <description>Aggregates dependencies and run's the CDI TCK on JBoss Embedded</description> <dependencies> <dependency> - <groupId>org.jboss.webbeans</groupId> + <groupId>org.jboss.weld</groupId> <artifactId>jsr299-api</artifactId> </dependency> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-core</artifactId> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-core</artifactId> </dependency> <dependency> - <groupId>org.jboss.webbeans</groupId> - <artifactId>webbeans-porting-package</artifactId> + <groupId>org.jboss.weld</groupId> + <artifactId>weld-porting-package</artifactId> </dependency> <dependency> Modified: ri/trunk/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties =================================================================== --- ri/trunk/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/embedded-tck-runner/src/test/debug-resources/META-INF/jboss-test-harness.properties 2009-10-08 05:29:40 UTC (rev 3892) @@ -1,6 +1,6 @@ # Configuration for running incontainer tests from your IDE # Alter the path webbeans accordingly (relative from the tck/impl dir) org.jboss.testharness.standalone=false -org.jboss.testharness.container.extraConfigurationDir=../../webbeans/jboss-as +org.jboss.testharness.container.extraConfigurationDir=../../weld/jboss-as org.jboss.testharness.container.forceRestart=false -org.jboss.testharness.runIntegrationTests=true \ No newline at end of file +org.jboss.testharness.runIntegrationTests=true Modified: ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml =================================================================== --- ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/embedded-tck-runner/src/test/resources/log4j.xml 2009-10-08 05:29:40 UTC (rev 3892) @@ -56,11 +56,11 @@ <!-- ############### Web Beans logging ################### --> - <category name="org.jboss.webbeans"> + <category name="org.jboss.weld"> <priority value="WARN"/> </category> - <category name="org.jboss.webbeans.tck"> + <category name="org.jboss.weld.tck"> <priority value="INFO"/> </category> Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java 2009-10-08 05:29:40 UTC (rev 3892) @@ -100,7 +100,7 @@ /** * Constructor * - * @param manager The Web Beans manager + * @param manager The Weld manager */ public AbstractBean(String idSuffix, BeanManagerImpl manager) { @@ -124,7 +124,7 @@ } initDefaultBindings(); initPrimitive(); - log.trace("Building Web Bean bean metadata for #0", getType()); + log.trace("Building Weld bean metadata for #0", getType()); initName(); initScopeType(); initSerializable(); @@ -338,7 +338,7 @@ * * @return The set of binding types * - * @see org.jboss.webbeans.bean.BaseBean#getQualifiers() + * @see org.jboss.weld.bean.BaseBean#getQualifiers() */ public Set<Annotation> getQualifiers() { @@ -376,7 +376,7 @@ * * @return The name * - * @see org.jboss.webbeans.bean.BaseBean#getName() + * @see org.jboss.weld.bean.BaseBean#getName() */ public String getName() { @@ -388,7 +388,7 @@ * * @return The scope type * - * @see org.jboss.webbeans.bean.BaseBean#getScope() + * @see org.jboss.weld.bean.BaseBean#getScope() */ public Class<? extends Annotation> getScope() { @@ -411,7 +411,7 @@ * * @return The set of API types * - * @see org.jboss.webbeans.bean.BaseBean#getTypeClosure() + * @see org.jboss.weld.bean.BaseBean#getTypeClosure() */ public Set<Type> getTypes() { @@ -435,7 +435,7 @@ * * @return True if nullable, false otherwise * - * @see org.jboss.webbeans.bean.BaseBean#isNullable() + * @see org.jboss.weld.bean.BaseBean#isNullable() */ public boolean isNullable() { Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bean/AbstractReceiverBean.java 2009-10-08 05:29:40 UTC (rev 3892) @@ -93,7 +93,7 @@ } /* (non-Javadoc) - * @see org.jboss.webbeans.bean.AbstractBean#isPolicy() + * @see org.jboss.weld.bean.AbstractBean#isPolicy() */ @Override public boolean isAlternative() Modified: ri/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyProvider.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyProvider.java 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/ClientProxyProvider.java 2009-10-08 05:29:40 UTC (rev 3892) @@ -36,7 +36,7 @@ * * @author Nicklas Karlsson * - * @see org.jboss.webbeans.bean.proxy.ProxyMethodHandler + * @see org.jboss.weld.bean.proxy.ProxyMethodHandler */ public class ClientProxyProvider { Modified: ri/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/impl/src/main/java/org/jboss/weld/context/AbstractMapContext.java 2009-10-08 05:29:40 UTC (rev 3892) @@ -38,8 +38,8 @@ * @author Nicklas Karlsson * @author Pete Muir * - * @see org.jboss.webbeans.contexts.SharedContext - * @see org.jboss.webbeans.context.BasicContext + * @see org.jboss.weld.contexts.SharedContext + * @see org.jboss.weld.context.BasicContext */ public abstract class AbstractMapContext extends AbstractContext { Modified: ri/trunk/impl/src/main/java/org/jboss/weld/conversation/JavaSEConversationTerminator.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/weld/conversation/JavaSEConversationTerminator.java 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/impl/src/main/java/org/jboss/weld/conversation/JavaSEConversationTerminator.java 2009-10-08 05:29:40 UTC (rev 3892) @@ -31,7 +31,7 @@ * A ConversationTerminator implementation using Java SE scheduling * * @author Nicklas Karlsson - * @see org.jboss.webbeans.conversation.ConversationTerminator + * @see org.jboss.weld.conversation.ConversationTerminator */ @SessionScoped public class JavaSEConversationTerminator implements ConversationTerminator, Serializable Modified: ri/trunk/inject-tck-runner/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension =================================================================== --- ri/trunk/inject-tck-runner/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/inject-tck-runner/src/test/resources/META-INF/services/javax.enterprise.inject.spi.Extension 2009-10-08 05:29:40 UTC (rev 3892) @@ -1 +1 @@ -org.jboss.webbeans.atinject.tck.BeanDisambiguator \ No newline at end of file +org.jboss.weld.atinject.tck.BeanDisambiguator Modified: ri/trunk/inject-tck-runner/src/test/resources/log4j.xml =================================================================== --- ri/trunk/inject-tck-runner/src/test/resources/log4j.xml 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/inject-tck-runner/src/test/resources/log4j.xml 2009-10-08 05:29:40 UTC (rev 3892) @@ -14,7 +14,7 @@ </filter> <filter class="org.apache.log4j.varia.StringMatchFilter"> <param name="AcceptOnMatch" value="false" /> - <param name="StringToMatch" value="Error destroying org.jboss.webbeans.bean-test-ManagedBean-org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.Cod" /> + <param name="StringToMatch" value="Error destroying org.jboss.weld.bean-test-ManagedBean-org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.Cod" /> </filter> </appender> @@ -56,11 +56,11 @@ <!-- ############### Web Beans logging ################### --> - <category name="org.jboss.webbeans"> + <category name="org.jboss.weld"> <priority value="WARN"/> </category> - <category name="org.jboss.webbeans.tck"> + <category name="org.jboss.weld.tck"> <priority value="INFO"/> </category> Modified: ri/trunk/inject-tck-runner/tests.xml =================================================================== --- ri/trunk/inject-tck-runner/tests.xml 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/inject-tck-runner/tests.xml 2009-10-08 05:29:40 UTC (rev 3892) @@ -4,8 +4,8 @@ <test name="Web Beans RI" junit="true"> <classes> - <class name="org.jboss.webbeans.atinject.tck.AtInjectTCK"></class> + <class name="org.jboss.weld.atinject.tck.AtInjectTCK"></class> </classes> </test> -</suite> \ No newline at end of file +</suite> Modified: ri/trunk/jboss-as/build.xml =================================================================== --- ri/trunk/jboss-as/build.xml 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/jboss-as/build.xml 2009-10-08 05:29:40 UTC (rev 3892) @@ -13,51 +13,51 @@ <delete dir="target" failonerror="false" /> </target> - <target name="update" depends="install-webbeans.deployer, install-javassist-update" description="Update JBoss 5.x or 6.x for Web Beans" /> + <target name="update" depends="install-weld.deployer, install-javassist-update" description="Update JBoss 5.x or 6.x for Web Beans" /> - <target name="install-webbeans.deployer"> - <echo message="Installing Web Beans ${webbeans.version} to ${jboss.home}" /> + <target name="install-weld.deployer"> + <echo message="Installing Weld ${weld.version} to ${jboss.home}" /> <fail unless="jboss.home" message="Please pass in -Djboss.home=..." /> - <delete dir="${jboss.home}/server/default/deployers/webbeans.deployer" failonerror="false" /> + <delete dir="${jboss.home}/server/default/deployers/weld.deployer" failonerror="false" /> <delete dir="target" failonerror="false" /> - <artifact:dependencies filesetId="webbeans.deployer.fileset" versionsId="webbeans.deployer.versions"> - <dependency groupId="org.jboss.webbeans.integration" artifactId="webbeans-jboss-int-deployer-assembly" version="${webbeans-deployer.version}" type="zip" /> - <dependency groupId="org.jboss.webbeans" artifactId="webbeans-core" version="${webbeans.version}" /> + <artifact:dependencies filesetId="weld.deployer.fileset" versionsId="weld.deployer.versions"> + <dependency groupId="org.jboss.weld.integration" artifactId="weld-jboss-int-deployer-assembly" version="${weld-deployer.version}" type="zip" /> + <dependency groupId="org.jboss.weld" artifactId="weld-core" version="${weld.version}" /> <remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" /> <remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" /> </artifact:dependencies> <mkdir dir="target/dependency/lib" /> <copy todir="target/dependency/lib"> - <fileset refid="webbeans.deployer.fileset" /> + <fileset refid="weld.deployer.fileset" /> <chainedmapper> <flattenmapper /> - <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${webbeans.deployer.versions}" to="flatten" /> + <mapper classpathref="maven-ant-tasks.classpath" classname="org.apache.maven.artifact.ant.VersionMapper" from="${weld.deployer.versions}" to="flatten" /> </chainedmapper> </copy> - <unzip dest="target" src="target/dependency/lib/webbeans-jboss-int-deployer-assembly.zip" /> + <unzip dest="target" src="target/dependency/lib/weld-jboss-int-deployer-assembly.zip" /> - <copy todir="target/webbeans.deployer/lib-int/" overwrite="true"> + <copy todir="target/weld.deployer/lib-int/" overwrite="true"> <fileset dir="target/dependency/lib"> - <include name="webbeans-core.jar" /> + <include name="weld-core.jar" /> </fileset> </copy> - <copy todir="target/webbeans.deployer/" overwrite="true"> + <copy todir="target/weld.deployer/" overwrite="true"> <fileset dir="target/dependency/lib"> - <include name="webbeans-api.jar" /> + <include name="weld-api.jar" /> <include name="jsr299-api.jar" /> - <include name="webbeans-logger.jar" /> + <include name="weld-logger.jar" /> </fileset> </copy> <delete dir="target/dependency" /> - <copy todir="${jboss.home}/server/default/deployers/webbeans.deployer"> - <fileset dir="target/webbeans.deployer"> + <copy todir="${jboss.home}/server/default/deployers/weld.deployer"> + <fileset dir="target/weld.deployer"> <include name="**/*" /> </fileset> </copy> Modified: ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml =================================================================== --- ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/jboss-tck-runner/src/test/resources/log4j.xml 2009-10-08 05:29:40 UTC (rev 3892) @@ -14,7 +14,7 @@ </filter> <filter class="org.apache.log4j.varia.StringMatchFilter"> <param name="AcceptOnMatch" value="false" /> - <param name="StringToMatch" value="Error destroying org.jboss.webbeans.bean-test-ManagedBean-org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.Cod" /> + <param name="StringToMatch" value="Error destroying org.jboss.weld.bean-test-ManagedBean-org.jboss.jsr299.tck.tests.implementation.simple.lifecycle.Cod" /> </filter> </appender> @@ -56,11 +56,11 @@ <!-- ############### Web Beans logging ################### --> - <category name="org.jboss.webbeans"> + <category name="org.jboss.weld"> <priority value="WARN"/> </category> - <category name="org.jboss.webbeans.tck"> + <category name="org.jboss.weld.tck"> <priority value="INFO"/> </category> Modified: ri/trunk/logging/src/test/java/org/jboss/weld/test/log/LoggingTest.java =================================================================== --- ri/trunk/logging/src/test/java/org/jboss/weld/test/log/LoggingTest.java 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/logging/src/test/java/org/jboss/weld/test/log/LoggingTest.java 2009-10-08 05:29:40 UTC (rev 3892) @@ -30,7 +30,7 @@ log.info(TEST_MSG); assert TestAppender.getLastEvent() != null : "There was no last event in Log4j"; - assert TestAppender.getLastEvent().getLoggerName().equals("org.jboss.webbeans.test.log.LoggingTest"); + assert TestAppender.getLastEvent().getLoggerName().equals("org.jboss.weld.test.log.LoggingTest"); assert TestAppender.getLastEvent().getRenderedMessage().equals(TEST_MSG) : "Last event has incorrect message"; } Modified: ri/trunk/logging/src/test/resources/log4j.xml =================================================================== --- ri/trunk/logging/src/test/resources/log4j.xml 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/logging/src/test/resources/log4j.xml 2009-10-08 05:29:40 UTC (rev 3892) @@ -2,14 +2,14 @@ <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/" debug="false"> - <appender name="CONSOLE" class="org.jboss.webbeans.test.log.TestAppender"> + <appender name="CONSOLE" class="org.jboss.weld.test.log.TestAppender"> <layout class="org.apache.log4j.PatternLayout"> <!-- The default pattern: Date Priority [Category] Message\n --> <param name="ConversionPattern" value="%d{ABSOLUTE} %-5p [%c{2}] %m%n"/> </layout> </appender> - <category name="org.jboss.webbeans.test"> + <category name="org.jboss.weld.test"> <priority value="INFO"/> </category> Modified: ri/trunk/porting-package/src/main/resources/META-INF/jboss-test-harness.properties =================================================================== --- ri/trunk/porting-package/src/main/resources/META-INF/jboss-test-harness.properties 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/porting-package/src/main/resources/META-INF/jboss-test-harness.properties 2009-10-08 05:29:40 UTC (rev 3892) @@ -1,4 +1,4 @@ -org.jboss.jsr299.tck.spi.Managers=org.jboss.webbeans.tck.ManagersImpl -org.jboss.jsr299.tck.spi.Beans=org.jboss.webbeans.tck.BeansImpl -org.jboss.jsr299.tck.spi.Contexts=org.jboss.webbeans.tck.ContextsImpl -org.jboss.jsr299.tck.spi.EL=org.jboss.webbeans.tck.ELImpl \ No newline at end of file +org.jboss.jsr299.tck.spi.Managers=org.jboss.weld.tck.ManagersImpl +org.jboss.jsr299.tck.spi.Beans=org.jboss.weld.tck.BeansImpl +org.jboss.jsr299.tck.spi.Contexts=org.jboss.weld.tck.ContextsImpl +org.jboss.jsr299.tck.spi.EL=org.jboss.weld.tck.ELImpl Modified: ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/helpers/AbstractResourceServices.java =================================================================== --- ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/helpers/AbstractResourceServices.java 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/spi/src/main/java/org/jboss/weld/injection/spi/helpers/AbstractResourceServices.java 2009-10-08 05:29:40 UTC (rev 3892) @@ -12,12 +12,11 @@ import org.jboss.weld.bootstrap.api.Service; public abstract class AbstractResourceServices implements Service -{ - +{ private static final String RESOURCE_LOOKUP_PREFIX = "java:/comp/env"; /* (non-Javadoc) - * @see org.jboss.webbeans.resources.spi.helpers.ResourceServices#resolveResource(javax.inject.manager.InjectionPoint) + * @see org.jboss.weld.resources.spi.helpers.ResourceServices#resolveResource(javax.inject.manager.InjectionPoint) */ public Object resolveResource(InjectionPoint injectionPoint) { @@ -94,7 +93,9 @@ propertyName = getPropertyName((Method) injectionPoint.getMember()); if (propertyName == null) { - throw new IllegalArgumentException("Injection point represents a method which doesn't follow JavaBean conventions (unable to determine property name) " + injectionPoint); + throw new IllegalArgumentException( + "Injection point represents a method which doesn't follow " + + "JavaBean conventions (unable to determine property name) " + injectionPoint); } } else Modified: ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java =================================================================== --- ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/spi/src/test/java/org/jboss/weld/bootstrap/api/test/MockSecurityServices.java 2009-10-08 05:29:40 UTC (rev 3892) @@ -28,7 +28,7 @@ { /* (non-Javadoc) - * @see org.jboss.webbeans.security.spi.SecurityServices#getPrincipal() + * @see org.jboss.weld.security.spi.SecurityServices#getPrincipal() */ public Principal getPrincipal() { Modified: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockSecurityServices.java 2009-10-08 05:29:40 UTC (rev 3892) @@ -28,7 +28,7 @@ { /* (non-Javadoc) - * @see org.jboss.webbeans.security.spi.SecurityServices#getPrincipal() + * @see org.jboss.weld.security.spi.SecurityServices#getPrincipal() */ public Principal getPrincipal() { Modified: ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/tests/src/main/java/org/jboss/weld/mock/MockServletLifecycle.java 2009-10-08 05:29:40 UTC (rev 3892) @@ -54,7 +54,7 @@ } /* (non-Javadoc) - * @see org.jboss.webbeans.mock.MockLifecycle#initialize() + * @see org.jboss.weld.mock.MockLifecycle#initialize() */ public void initialize() { @@ -85,7 +85,7 @@ } /* (non-Javadoc) - * @see org.jboss.webbeans.mock.MockLifecycle#beginApplication() + * @see org.jboss.weld.mock.MockLifecycle#beginApplication() */ public void beginApplication() { @@ -93,7 +93,7 @@ } /* (non-Javadoc) - * @see org.jboss.webbeans.mock.MockLifecycle#endApplication() + * @see org.jboss.weld.mock.MockLifecycle#endApplication() */ @Override public void endApplication() @@ -102,7 +102,7 @@ } /* (non-Javadoc) - * @see org.jboss.webbeans.mock.MockLifecycle#resetContexts() + * @see org.jboss.weld.mock.MockLifecycle#resetContexts() */ public void resetContexts() { @@ -110,7 +110,7 @@ } /* (non-Javadoc) - * @see org.jboss.webbeans.mock.MockLifecycle#beginRequest() + * @see org.jboss.weld.mock.MockLifecycle#beginRequest() */ public void beginRequest() { @@ -118,7 +118,7 @@ } /* (non-Javadoc) - * @see org.jboss.webbeans.mock.MockLifecycle#endRequest() + * @see org.jboss.weld.mock.MockLifecycle#endRequest() */ public void endRequest() { @@ -126,7 +126,7 @@ } /* (non-Javadoc) - * @see org.jboss.webbeans.mock.MockLifecycle#beginSession() + * @see org.jboss.weld.mock.MockLifecycle#beginSession() */ public void beginSession() { @@ -134,7 +134,7 @@ } /* (non-Javadoc) - * @see org.jboss.webbeans.mock.MockLifecycle#endSession() + * @see org.jboss.weld.mock.MockLifecycle#endSession() */ public void endSession() { Modified: ri/trunk/tests/src/main/resources/META-INF/jboss-test-harness.properties =================================================================== --- ri/trunk/tests/src/main/resources/META-INF/jboss-test-harness.properties 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/tests/src/main/resources/META-INF/jboss-test-harness.properties 2009-10-08 05:29:40 UTC (rev 3892) @@ -1 +1 @@ -org.jboss.testharness.spi.StandaloneContainers=org.jboss.webbeans.test.harness.StandaloneContainersImpl +org.jboss.testharness.spi.StandaloneContainers=org.jboss.weld.test.harness.StandaloneContainersImpl Modified: ri/trunk/tests/unit-tests.xml =================================================================== --- ri/trunk/tests/unit-tests.xml 2009-10-08 05:27:34 UTC (rev 3891) +++ ri/trunk/tests/unit-tests.xml 2009-10-08 05:29:40 UTC (rev 3892) @@ -1,8 +1,8 @@ <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > -<suite name="Web Beans RI" verbose="3" > +<suite name="Weld" verbose="3" > - <test name="Web Beans RI"> + <test name="Weld"> <method-selectors> <method-selector> <selector-class name="org.jboss.testharness.impl.testng.DisableIntegrationTestsMethodSelector" /> @@ -18,49 +18,49 @@ </run> </groups> <packages> - <package name="org.jboss.webbeans.test.examples" /> + <package name="org.jboss.weld.test.examples" /> - <package name="org.jboss.webbeans.test.unit.activities" /> - <package name="org.jboss.webbeans.test.unit.activities.current" /> - <package name="org.jboss.webbeans.test.unit.activities.child" /> - <package name="org.jboss.webbeans.test.unit.annotated" /> - <package name="org.jboss.webbeans.test.unit.annotated.decoration" /> - <package name="org.jboss.webbeans.test.unit.bootstrap" /> - <package name="org.jboss.webbeans.test.unit.bootstrap.environments" /> - <package name="org.jboss.webbeans.test.unit.bootstrap.multipleEnterprise" /> - <package name="org.jboss.webbeans.test.unit.bootstrap.multipleEnterpriseAndSimple" /> - <package name="org.jboss.webbeans.test.unit.bootstrap.multipleSimple" /> - <package name="org.jboss.webbeans.test.unit.bootstrap.singleEnterprise" /> - <package name="org.jboss.webbeans.test.unit.bootstrap.singleProducerMethod" /> - <package name="org.jboss.webbeans.test.unit.bootstrap.singleSimple" /> - <package name="org.jboss.webbeans.test.unit.cluster" /> - <package name="org.jboss.webbeans.test.unit.context" /> - <package name="org.jboss.webbeans.test.unit.decorator.simple" /> - <package name="org.jboss.webbeans.test.unit.definition" /> - <package name="org.jboss.webbeans.test.unit.deployment.structure" /> - <package name="org.jboss.webbeans.test.unit.evironments.servlet" /> - <package name="org.jboss.webbeans.test.unit.implementation" /> - <package name="org.jboss.webbeans.test.unit.implementation.annotatedItem" /> - <package name="org.jboss.webbeans.test.unit.implementation.enterpise" /> - <package name="org.jboss.webbeans.test.unit.implementation.enterpise.lifecycle" /> - <package name="org.jboss.webbeans.test.unit.implementation.enterprise.sbi" /> - <package name="org.jboss.webbeans.test.unit.implementation.event" /> - <package name="org.jboss.webbeans.test.unit.implementation.event.tx" /> - <package name="org.jboss.webbeans.test.unit.implementation.exceptions" /> - <package name="org.jboss.webbeans.test.unit.implementation.named" /> - <package name="org.jboss.webbeans.test.unit.implementation.newsimple" /> - <package name="org.jboss.webbeans.test.unit.implementation.producer.field" /> - <package name="org.jboss.webbeans.test.unit.implementation.producer.method" /> - <package name="org.jboss.webbeans.test.unit.implementation.proxy" /> - <package name="org.jboss.webbeans.test.unit.implementation.proxy.enterprise" /> - <package name="org.jboss.webbeans.test.unit.lookup" /> - <package name="org.jboss.webbeans.test.unit.lookup.circular" /> - <package name="org.jboss.webbeans.test.unit.lookup.wbri279" /> - <package name="org.jboss.webbeans.test.unit.lookup.wbri293" /> - <package name="org.jboss.webbeans.test.unit.manager" /> - <package name="org.jboss.webbeans.test.unit.noncontextual" /> - <package name="org.jboss.webbeans.test.unit.security" /> + <package name="org.jboss.weld.test.unit.activities" /> + <package name="org.jboss.weld.test.unit.activities.current" /> + <package name="org.jboss.weld.test.unit.activities.child" /> + <package name="org.jboss.weld.test.unit.annotated" /> + <package name="org.jboss.weld.test.unit.annotated.decoration" /> + <package name="org.jboss.weld.test.unit.bootstrap" /> + <package name="org.jboss.weld.test.unit.bootstrap.environments" /> + <package name="org.jboss.weld.test.unit.bootstrap.multipleEnterprise" /> + <package name="org.jboss.weld.test.unit.bootstrap.multipleEnterpriseAndSimple" /> + <package name="org.jboss.weld.test.unit.bootstrap.multipleSimple" /> + <package name="org.jboss.weld.test.unit.bootstrap.singleEnterprise" /> + <package name="org.jboss.weld.test.unit.bootstrap.singleProducerMethod" /> + <package name="org.jboss.weld.test.unit.bootstrap.singleSimple" /> + <package name="org.jboss.weld.test.unit.cluster" /> + <package name="org.jboss.weld.test.unit.context" /> + <package name="org.jboss.weld.test.unit.decorator.simple" /> + <package name="org.jboss.weld.test.unit.definition" /> + <package name="org.jboss.weld.test.unit.deployment.structure" /> + <package name="org.jboss.weld.test.unit.evironments.servlet" /> + <package name="org.jboss.weld.test.unit.implementation" /> + <package name="org.jboss.weld.test.unit.implementation.annotatedItem" /> + <package name="org.jboss.weld.test.unit.implementation.enterpise" /> + <package name="org.jboss.weld.test.unit.implementation.enterpise.lifecycle" /> + <package name="org.jboss.weld.test.unit.implementation.enterprise.sbi" /> + <package name="org.jboss.weld.test.unit.implementation.event" /> + <package name="org.jboss.weld.test.unit.implementation.event.tx" /> + <package name="org.jboss.weld.test.unit.implementation.exceptions" /> + <package name="org.jboss.weld.test.unit.implementation.named" /> + <package name="org.jboss.weld.test.unit.implementation.newsimple" /> + <package name="org.jboss.weld.test.unit.implementation.producer.field" /> + <package name="org.jboss.weld.test.unit.implementation.producer.method" /> + <package name="org.jboss.weld.test.unit.implementation.proxy" /> + <package name="org.jboss.weld.test.unit.implementation.proxy.enterprise" /> + <package name="org.jboss.weld.test.unit.lookup" /> + <package name="org.jboss.weld.test.unit.lookup.circular" /> + <package name="org.jboss.weld.test.unit.lookup.wbri279" /> + <package name="org.jboss.weld.test.unit.lookup.wbri293" /> + <package name="org.jboss.weld.test.unit.manager" /> + <package name="org.jboss.weld.test.unit.noncontextual" /> + <package name="org.jboss.weld.test.unit.security" /> </packages> </test> -</suite> \ No newline at end of file +</suite>