[portal-commits] JBoss Portal SVN: r11433 - in branches/JBoss_Portal_Branch_2_7: core/src/main/org/jboss/portal/core/identity and 2 other directories.

Author: thomas.heute(a)jboss.com Date: 2008-07-14 09:43:40 -0400 (Mon, 14 Jul 2008) New Revision: 11433 Modified: branches/JBoss_Portal_Branch_2_7/core/.classpath branches/JBoss_Portal_Branch_2_7/core/build.xml branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java branches/JBoss_Portal_Branch_2_7/server/.classpath branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/aspects/LockInterceptor.java Log: Removed usage of backport-concurrent Modified: branches/JBoss_Portal_Branch_2_7/core/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/.classpath 2008-07-14 02:07:23 UTC (rev 11432) +++ branches/JBoss_Portal_Branch_2_7/core/.classpath 2008-07-14 13:43:40 UTC (rev 11433) @@ -48,7 +48,6 @@ <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jbossha.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar" sourcepath="/module-portlet-trunk"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar" sourcepath="/module-portlet-trunk"/> Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-07-14 02:07:23 UTC (rev 11432) +++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-07-14 13:43:40 UTC (rev 11433) @@ -93,7 +93,6 @@ <path refid="jboss.portal/modules/identity.classpath"/> <path refid="jboss.portal/modules/portlet.classpath"/> <path refid="jboss.portal/modules/test.classpath"/> - <path refid="jboss/backport.concurrent.classpath"/> <path refid="jboss.microcontainer.classpath"/> <path refid="jboss.jbossxb.classpath"/> <path refid="jboss.cache.classpath"/> @@ -343,7 +342,6 @@ <fileset dir="${freemarker.freemarker.lib}" includes="freemarker.jar"/> <fileset dir="${portals.bridges.lib}" includes="portals-bridges-common.jar"/> <fileset dir="${tagsoup.tagsoup.lib}" includes="tagsoup.jar"/> - <fileset dir="${jboss/backport.concurrent.lib}" includes="jboss-backport-concurrent.jar"/> <fileset dir="${jbpm.jpdl.lib}" includes="jbpm-jpdl.jar,jbpm-identity.jar"/> </copy> Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2008-07-14 02:07:23 UTC (rev 11432) +++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2008-07-14 13:43:40 UTC (rev 11433) @@ -22,14 +22,14 @@ package org.jboss.portal.core.identity; -import edu.emory.mathcs.backport.java.util.Queue; -import edu.emory.mathcs.backport.java.util.concurrent.Callable; -import edu.emory.mathcs.backport.java.util.concurrent.Executor; -import edu.emory.mathcs.backport.java.util.concurrent.Executors; -import edu.emory.mathcs.backport.java.util.concurrent.FutureTask; -import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue; -import edu.emory.mathcs.backport.java.util.concurrent.ScheduledExecutorService; -import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; +import java.util.Queue; +import java.util.concurrent.Callable; +import java.util.concurrent.Executor; +import java.util.concurrent.Executors; +import java.util.concurrent.FutureTask; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; import org.jboss.logging.Logger; import org.jboss.portal.jems.as.system.AbstractJBossService; Modified: branches/JBoss_Portal_Branch_2_7/server/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7/server/.classpath 2008-07-14 02:07:23 UTC (rev 11432) +++ branches/JBoss_Portal_Branch_2_7/server/.classpath 2008-07-14 13:43:40 UTC (rev 11433) @@ -11,7 +11,6 @@ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/> <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/jems"/> - <classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/web/lib/portal-web-lib.jar" sourcepath="/module-web"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> Modified: branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/aspects/LockInterceptor.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/aspects/LockInterceptor.java 2008-07-14 02:07:23 UTC (rev 11432) +++ branches/JBoss_Portal_Branch_2_7/server/src/main/org/jboss/portal/server/aspects/LockInterceptor.java 2008-07-14 13:43:40 UTC (rev 11433) @@ -22,8 +22,8 @@ ******************************************************************************/ package org.jboss.portal.server.aspects; -import edu.emory.mathcs.backport.java.util.concurrent.locks.Lock; -import edu.emory.mathcs.backport.java.util.concurrent.locks.ReentrantLock; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; import org.jboss.portal.common.invocation.Interceptor; import org.jboss.portal.common.invocation.Invocation; import org.jboss.portal.common.invocation.InvocationException;