[webbeans-commits] Webbeans SVN: r3677 - in ri/branches/kabir-builder: impl/src/main/java/org/jboss/webbeans/resolution and 9 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Sep 16 11:52:23 EDT 2009
Author: kabir.khan at jboss.com
Date: 2009-09-16 11:52:22 -0400 (Wed, 16 Sep 2009)
New Revision: 3677
Modified:
ri/branches/kabir-builder/
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELContext.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingMethodExpression.java
ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingValueExpression.java
ri/branches/kabir-builder/jboss-as/build.xml
ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java
ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java
ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/helpers/ForwardingBeanDeploymentArchive.java
ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java
ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java
ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java
ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/injection/spi/helpers/ForwardingJpaInjectionServices.java
ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceLoader.java
ri/branches/kabir-builder/tests/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java
Log:
Merged revisions 3670,3674 via svnmerge from
https://svn.jboss.org/repos/webbeans/ri/trunk
.......
r3670 | pete.muir at jboss.org | 2009-09-15 16:33:16 +0100 (Tue, 15 Sep 2009) | 1 line
Fix equals
.......
r3674 | pete.muir at jboss.org | 2009-09-15 23:42:39 +0100 (Tue, 15 Sep 2009) | 1 line
new name for assembled deployer artifact
.......
Property changes on: ri/branches/kabir-builder
___________________________________________________________________
Name: svnmerge-integrated
- /ri/trunk:1-3669
+ /ri/trunk:1-3676
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/resolution/ForwardingResolvable.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -65,7 +65,7 @@
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj || delegate().equals(obj);
}
@Override
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELContext.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELContext.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELContext.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -55,7 +55,7 @@
@Override
public boolean equals(Object obj)
{
- return delgate().equals(obj);
+ return this == obj || delgate().equals(obj);
}
@SuppressWarnings("unchecked")
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingELResolver.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -66,7 +66,7 @@
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj || delegate().equals(obj);
}
@Override
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingExpressionFactory.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -58,7 +58,7 @@
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj || delegate().equals(obj);
}
@Override
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingMethodExpression.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingMethodExpression.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingMethodExpression.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -55,11 +55,10 @@
return delegate().isLiteralText();
}
-
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj || delegate().equals(obj);
}
@Override
Modified: ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingValueExpression.java
===================================================================
--- ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingValueExpression.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/impl/src/main/java/org/jboss/webbeans/util/el/ForwardingValueExpression.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -77,7 +77,7 @@
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj || delegate().equals(obj);
}
@Override
Modified: ri/branches/kabir-builder/jboss-as/build.xml
===================================================================
--- ri/branches/kabir-builder/jboss-as/build.xml 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/jboss-as/build.xml 2009-09-16 15:52:22 UTC (rev 3677)
@@ -23,7 +23,7 @@
<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" version="${webbeans-deployer.version}" type="zip" />
+ <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}" />
<remoteRepository id="repository.jboss.org" url="http://repository.jboss.org/maven2" />
<remoteRepository id="snapshots.jboss.org" url="http://snapshots.jboss.org/maven2" />
@@ -38,7 +38,7 @@
</chainedmapper>
</copy>
- <unzip dest="target" src="target/dependency/lib/webbeans-jboss-int-deployer.zip" />
+ <unzip dest="target" src="target/dependency/lib/webbeans-jboss-int-deployer-assembly.zip" />
<copy todir="target/webbeans.deployer/lib-int/" overwrite="true">
<fileset dir="target/dependency/lib">
Modified: ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java
===================================================================
--- ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingBootstrap.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -63,7 +63,7 @@
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj ||delegate().equals(obj);
}
public Bootstrap deployBeans()
Modified: ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java
===================================================================
--- ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/bootstrap/api/helpers/ForwardingLifecycle.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -105,7 +105,7 @@
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj || delegate().equals(obj);
}
}
Modified: ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/helpers/ForwardingBeanDeploymentArchive.java
===================================================================
--- ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/helpers/ForwardingBeanDeploymentArchive.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/bootstrap/spi/helpers/ForwardingBeanDeploymentArchive.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -60,7 +60,7 @@
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj || delegate().equals(obj);
}
@Override
Modified: ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java
===================================================================
--- ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/context/api/helpers/ForwardingBeanStore.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -47,7 +47,7 @@
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj || delegate().equals(obj);
}
}
Modified: ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java
===================================================================
--- ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbDescriptor.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -65,7 +65,7 @@
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj || delegate().equals(obj);
}
@Override
Modified: ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java
===================================================================
--- ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/ejb/spi/helpers/ForwardingEjbServices.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -43,7 +43,7 @@
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj || delegate().equals(obj);
}
@Override
Modified: ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/injection/spi/helpers/ForwardingJpaInjectionServices.java
===================================================================
--- ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/injection/spi/helpers/ForwardingJpaInjectionServices.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/injection/spi/helpers/ForwardingJpaInjectionServices.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -62,7 +62,7 @@
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj || delegate().equals(obj);
}
}
Modified: ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceLoader.java
===================================================================
--- ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceLoader.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/spi/src/main/java/org/jboss/webbeans/resources/spi/helpers/ForwardingResourceLoader.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -38,7 +38,7 @@
@Override
public boolean equals(Object obj)
{
- return delegate().equals(obj);
+ return this == obj || delegate().equals(obj);
}
@Override
Modified: ri/branches/kabir-builder/tests/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java
===================================================================
--- ri/branches/kabir-builder/tests/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java 2009-09-16 15:30:35 UTC (rev 3676)
+++ ri/branches/kabir-builder/tests/src/main/java/org/jboss/webbeans/mock/MockEjbDescriptor.java 2009-09-16 15:52:22 UTC (rev 3677)
@@ -178,24 +178,24 @@
return builder.toString();
}
- @Override
- public boolean equals(Object other)
- {
- if (other instanceof EjbDescriptor)
- {
- EjbDescriptor<T> that = (EjbDescriptor<T>) other;
- return this.getBeanClass().equals(that.getBeanClass());
- }
- else
- {
- return false;
- }
- }
-
- @Override
- public int hashCode()
- {
- return getEjbName().hashCode();
- }
+// @Override
+// public boolean equals(Object other)
+// {
+// if (other instanceof EjbDescriptor)
+// {
+// EjbDescriptor<T> that = (EjbDescriptor<T>) other;
+// return this.getBeanClass().equals(that.getBeanClass());
+// }
+// else
+// {
+// return false;
+// }
+// }
+//
+// @Override
+// public int hashCode()
+// {
+// return getEjbName().hashCode();
+// }
}
More information about the weld-commits
mailing list