Author: thomas.heute(a)jboss.com Date: 2007-08-28 05:16:47 -0400 (Tue, 28 Aug 2007) New Revision: 8063 Added: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event/ Removed: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/user/ Modified: branches/JBoss_Portal_Branch_2_6/api/.classpath branches/JBoss_Portal_Branch_2_6/cms/.classpath branches/JBoss_Portal_Branch_2_6/core-admin/.classpath branches/JBoss_Portal_Branch_2_6/core-cms/.classpath branches/JBoss_Portal_Branch_2_6/core-samples/.classpath branches/JBoss_Portal_Branch_2_6/core-search/.classpath branches/JBoss_Portal_Branch_2_6/core/.classpath branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java branches/JBoss_Portal_Branch_2_6/faces/.classpath branches/JBoss_Portal_Branch_2_6/portlet-server/.classpath branches/JBoss_Portal_Branch_2_6/portlet/.classpath branches/JBoss_Portal_Branch_2_6/search/.classpath branches/JBoss_Portal_Branch_2_6/server/.classpath branches/JBoss_Portal_Branch_2_6/theme/.classpath branches/JBoss_Portal_Branch_2_6/workflow/.classpath branches/JBoss_Portal_Branch_2_6/wsrp/.classpath Log: - Eclipse classpath update - Fixed wrong package for UsersActivityStatesService Modified: branches/JBoss_Portal_Branch_2_6/api/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/api/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/api/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -2,5 +2,6 @@ <classpath> <classpathentry kind="src" path="src/main"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/cms/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/cms/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -31,12 +31,10 @@ <classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-collections/lib/commons-collections.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/jems"/> - <classpathentry combineaccessrules="false" kind="src" path="/test"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity"/> <classpathentry combineaccessrules="false" kind="src" path="/workflow"/> <classpathentry kind="lib" path="/thirdparty/jackrabbit/lib/jackrabbit-core.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/security"/> @@ -44,5 +42,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/search"/> <classpathentry kind="lib" path="/thirdparty/apache-lucene/lib/lucene.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/core/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/core/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -38,9 +38,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/server"/> <classpathentry combineaccessrules="false" kind="src" path="/security"/> <classpathentry combineaccessrules="false" kind="src" path="/cms"/> - <classpathentry combineaccessrules="false" kind="src" path="/test"/> <classpathentry combineaccessrules="false" kind="src" path="/theme"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity"/> <classpathentry combineaccessrules="false" kind="src" path="/format"/> <classpathentry combineaccessrules="false" kind="src" path="/registration"/> <classpathentry combineaccessrules="false" kind="src" path="/workflow"/> @@ -51,5 +49,12 @@ <classpathentry kind="lib" path="/thirdparty/freemarker/lib/freemarker.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"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-lib.jar"/> + <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="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/identity/UsersActivityStatsServiceImpl.java 2007-08-28 09:16:47 UTC (rev 8063) @@ -22,32 +22,27 @@ package org.jboss.portal.core.identity; -import org.jboss.portal.jems.as.system.AbstractJBossService; -import org.jboss.logging.Logger; -import org.jboss.mx.util.MBeanServerLocator; -import org.jboss.mx.util.MBeanProxy; -import org.jboss.mx.util.MBeanProxyCreationException; - -import java.util.Set; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; +import java.util.Set; +import javax.management.Notification; +import javax.management.NotificationListener; +import javax.management.ObjectName; + +import org.jboss.logging.Logger; +import org.jboss.portal.jems.as.system.AbstractJBossService; + +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.ScheduledExecutorService; -import edu.emory.mathcs.backport.java.util.concurrent.LinkedBlockingQueue; import edu.emory.mathcs.backport.java.util.concurrent.Executors; -import edu.emory.mathcs.backport.java.util.concurrent.TimeUnit; import edu.emory.mathcs.backport.java.util.concurrent.FutureTask; -import edu.emory.mathcs.backport.java.util.concurrent.Callable; -import edu.emory.mathcs.backport.java.util.Queue; +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 javax.management.NotificationListener; -import javax.management.Notification; -import javax.management.ObjectName; -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; - /** * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/core-admin/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -5,7 +5,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/faces"/> <classpathentry combineaccessrules="false" kind="src" path="/security"/> <classpathentry kind="lib" path="/thirdparty/apache-myfaces/lib/myfaces-api.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> <classpathentry combineaccessrules="false" kind="src" path="/core"/> <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> @@ -21,5 +20,7 @@ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/jsp-api.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-lib.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/core-cms/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-cms/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/core-cms/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -8,7 +8,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity"/> <classpathentry combineaccessrules="false" kind="src" path="/jems"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> @@ -25,5 +24,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/search"/> <classpathentry kind="lib" path="/thirdparty/apache-lucene/lib/lucene.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/core-samples/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/core-samples/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -6,12 +6,14 @@ <classpathentry combineaccessrules="false" kind="src" path="/api"/> <classpathentry combineaccessrules="false" kind="src" path="/format"/> <classpathentry combineaccessrules="false" kind="src" path="/core"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity"/> <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry combineaccessrules="false" kind="src" path="/theme"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-fileupload/lib/commons-fileupload.jar"/> <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar" sourcepath="/JBoss_AS_4.0.5/jmx/src/main"/> <classpathentry kind="output" path="bin"/> </classpath> Copied: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java (from rev 8062, branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/user/CurrentUsersPortlet.java) =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/CurrentUsersPortlet.java 2007-08-28 09:16:47 UTC (rev 8063) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.jboss.portal.core.samples.users; + +import java.io.IOException; +import java.io.PrintWriter; +import java.util.Set; + +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.UnavailableException; + +import org.apache.log4j.Logger; +import org.jboss.portal.core.identity.UsersActivityStatsService; +import org.jboss.portal.core.servlet.jsp.PortalJsp; +import org.jboss.portal.core.servlet.jsp.taglib.context.DelegateContext; +import org.jboss.portlet.JBossPortlet; +import org.jboss.portlet.JBossRenderRequest; +import org.jboss.portlet.JBossRenderResponse; + +/** + * Read the current users online and write them in output. + * + * @author <a href="mailto:jedim@vige.it">Luca Stancapiano</a> + */ +public class CurrentUsersPortlet extends JBossPortlet { + + /** + * Logger + */ + public static Logger log = Logger.getLogger(CurrentUsersPortlet.class); + + protected void doView(JBossRenderRequest rRequest, JBossRenderResponse rResponse) + throws PortletException, IOException, UnavailableException { + UsersActivityStatsService uass = (UsersActivityStatsService) this + .getPortletContext().getAttribute("UsersActivityStats"); + + rResponse.setContentType("text/html"); + PrintWriter writer = rResponse.getWriter(); + + //TODO: this is wrong - should pass period instead of current time - actually it works by a coincedence... + Set users = uass.getActiveUsersNames(System.currentTimeMillis()); + + if (users.size() == 1) { + DelegateContext ctx = new DelegateContext(); + ctx.put("USERS", users.toString()); + ctx.put("USERS_COUNT", Integer.toString(users.size())); + rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); + PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/oneUser.jsp"); + rd.include(rRequest, rResponse); + } else if (users.size() > 1) { + DelegateContext ctx = new DelegateContext(); + ctx.put("USERS", users.toString()); + ctx.put("USERS_COUNT", Integer.toString(users.size())); + rRequest.setAttribute(PortalJsp.CTX_REQUEST, ctx); + PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/users.jsp"); + rd.include(rRequest, rResponse); + } else { + PortletRequestDispatcher rd = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/users/noUser.jsp"); + rd.include(rRequest, rResponse); + } + + + writer.close(); + } +} Copied: branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/users/event (from rev 8062, branches/JBoss_Portal_Branch_2_6/core-samples/src/main/org/jboss/portal/core/samples/user/event) Modified: branches/JBoss_Portal_Branch_2_6/core-search/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-search/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/core-search/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -15,5 +15,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/search"/> <classpathentry combineaccessrules="false" kind="src" path="/faces"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/faces/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/faces/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/faces/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -15,5 +15,6 @@ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/bridge"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/portlet/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/portlet/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -21,10 +21,11 @@ <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> <classpathentry combineaccessrules="false" kind="src" path="/jems"/> - <classpathentry combineaccessrules="false" kind="src" path="/test"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> <classpathentry combineaccessrules="false" kind="src" path="/security"/> <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"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/portlet-server/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/portlet-server/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/portlet-server/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -14,5 +14,7 @@ <classpathentry combineaccessrules="false" kind="src" path="/security"/> <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/search/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/search/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/search/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -9,7 +9,7 @@ <classpathentry kind="lib" path="/thirdparty/apache-lucene/lib/lucene.jar"/> <classpathentry kind="lib" path="/thirdparty/jcr/lib/jcr-1.0.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/jems"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/server/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/server/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -3,7 +3,6 @@ <classpathentry kind="src" path="src/main"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/test"/> <classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss.jar"/> @@ -15,5 +14,7 @@ <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"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-jboss-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/theme/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/theme/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -17,8 +17,9 @@ <classpathentry combineaccessrules="false" kind="src" path="/jems"/> <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> - <classpathentry combineaccessrules="false" kind="src" path="/test"/> <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"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/workflow/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/workflow/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/workflow/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -10,8 +10,8 @@ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity"/> <classpathentry kind="lib" path="/thirdparty/jbpm/jaronly/lib/jbpm.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/identity/lib/portal-identity-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/wsrp/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/.classpath 2007-08-27 23:21:44 UTC (rev 8062) +++ branches/JBoss_Portal_Branch_2_6/wsrp/.classpath 2007-08-28 09:16:47 UTC (rev 8063) @@ -8,7 +8,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> - <classpathentry combineaccessrules="false" kind="src" path="/test"/> <classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/> <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss.jar"/> @@ -31,5 +30,7 @@ <classpathentry kind="lib" path="/thirdparty/apache-myfaces/lib/myfaces-api.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"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath>