Author: thomas.heute(a)jboss.com Date: 2007-09-11 03:27:07 -0400 (Tue, 11 Sep 2007) New Revision: 8214 Modified: branches/JBoss_Portal_Branch_2_6/bridge/.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-identity/.classpath branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java branches/JBoss_Portal_Branch_2_6/core-management/.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-wsrp/.classpath branches/JBoss_Portal_Branch_2_6/core/.classpath branches/JBoss_Portal_Branch_2_6/faces/.classpath branches/JBoss_Portal_Branch_2_6/portlet-server/.classpath branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java branches/JBoss_Portal_Branch_2_6/theme/.classpath branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java branches/JBoss_Portal_Branch_2_6/widget/.classpath branches/JBoss_Portal_Branch_2_6/wsrp/.classpath Log: Update Eclipse files Modified: branches/JBoss_Portal_Branch_2_6/bridge/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/bridge/.classpath 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/bridge/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -8,9 +8,10 @@ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar" sourcepath="/JBoss_AS_4.0.5/system/src/main"/> <classpathentry kind="lib" path="/thirdparty/portals-bridges/lib/portals-bridges-common.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> <classpathentry combineaccessrules="false" kind="src" path="/jems"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/cms/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/cms/.classpath 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/cms/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -33,7 +33,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/jems"/> <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="/workflow"/> <classpathentry kind="lib" path="/thirdparty/jackrabbit/lib/jackrabbit-core.jar"/> Modified: branches/JBoss_Portal_Branch_2_6/core/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/.classpath 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/core/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -32,7 +32,6 @@ <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/faces"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> <classpathentry combineaccessrules="false" kind="src" path="/jems"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> @@ -42,7 +41,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/format"/> <classpathentry combineaccessrules="false" kind="src" path="/registration"/> <classpathentry combineaccessrules="false" kind="src" path="/workflow"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet-federation"/> <classpathentry kind="lib" path="/thirdparty/jbpm/jaronly/lib/jbpm.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/portlet-server"/> <classpathentry kind="lib" path="/thirdparty/apache-xerces/lib/xml-apis.jar"/> @@ -56,5 +54,8 @@ <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"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/.classpath 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/core-admin/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -7,10 +7,8 @@ <classpathentry kind="lib" path="/thirdparty/apache-myfaces/lib/myfaces-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> <classpathentry combineaccessrules="false" kind="src" path="/core"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/theme"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet-federation"/> <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-jmx.jar"/> @@ -22,5 +20,7 @@ <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="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-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-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/core-cms/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -5,7 +5,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/cms"/> <classpathentry combineaccessrules="false" kind="src" path="/core"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> - <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="/jems"/> @@ -26,5 +25,7 @@ <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/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/.classpath 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/core-identity/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -7,7 +7,6 @@ <classpathentry combineaccessrules="false" kind="src" path="/faces"/> <classpathentry combineaccessrules="false" kind="src" path="/format"/> <classpathentry combineaccessrules="false" kind="src" path="/jems"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry combineaccessrules="false" kind="src" path="/security"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> <classpathentry combineaccessrules="false" kind="src" path="/workflow"/> @@ -48,5 +47,7 @@ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-portal-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/theme"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/main/org/jboss/portal/core/identity/ui/actions/EditProfileAction.java 2007-09-11 07:27:07 UTC (rev 8214) @@ -29,7 +29,6 @@ import javax.faces.application.FacesMessage; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; -import javax.portlet.PortletMode; import javax.portlet.WindowState; import javax.portlet.WindowStateException; @@ -45,7 +44,6 @@ import org.jboss.portal.server.ServerInvocationContext; import org.jboss.portlet.JBossActionRequest; import org.jboss.portlet.JBossActionResponse; -import org.jboss.portlet.JBossRenderResponse; /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> Modified: branches/JBoss_Portal_Branch_2_6/core-management/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-management/.classpath 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/core-management/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -6,9 +6,9 @@ <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-jmx.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet-federation"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-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-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/core-samples/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -6,7 +6,6 @@ <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="/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"/> @@ -15,5 +14,7 @@ <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="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/core-search/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-search/.classpath 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/core-search/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -9,12 +9,13 @@ <classpathentry kind="lib" path="/thirdparty/apache-myfaces/lib/myfaces-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/core"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> <classpathentry combineaccessrules="false" kind="src" path="/jems"/> <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="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-wsrp/.classpath 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/core-wsrp/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -4,8 +4,8 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/> <classpathentry combineaccessrules="false" kind="src" path="/wsrp"/> <classpathentry kind="lib" path="/thirdparty/apache-myfaces/lib/myfaces-api.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-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-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/faces/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -9,12 +9,13 @@ <classpathentry kind="lib" path="/thirdparty/el/lib/el-api.jar"/> <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/> <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> <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="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-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-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/portlet-server/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -2,7 +2,6 @@ <classpath> <classpathentry kind="src" path="src/main"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> @@ -16,5 +15,7 @@ <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="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> <classpathentry kind="output" path="bin"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/server/deployment/WebAppAdapter.java 2007-09-11 07:27:07 UTC (rev 8214) @@ -24,7 +24,6 @@ import org.jboss.deployment.DeploymentException; import org.jboss.portal.server.deployment.jboss.ServerDeployerMBean; -import org.jboss.portal.test.framework.impl.jboss.agent.JBossTestAgent; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -55,7 +54,7 @@ } catch (DeploymentException e) { - JBossTestAgent.record(e); +// JBossTestAgent.record(e); } } @@ -67,7 +66,7 @@ } catch (DeploymentException e) { - JBossTestAgent.record(e); +// JBossTestAgent.record(e); } } } Modified: branches/JBoss_Portal_Branch_2_6/theme/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/.classpath 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/theme/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -15,7 +15,6 @@ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-xml-binding.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/server"/> <classpathentry combineaccessrules="false" kind="src" path="/jems"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet"/> <classpathentry combineaccessrules="false" kind="src" path="/api"/> <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"/> Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/test/theme/tmp/TestHelper.java 2007-09-11 07:27:07 UTC (rev 8214) @@ -23,7 +23,6 @@ package org.jboss.portal.test.theme.tmp; import org.jboss.portal.common.invocation.AttributeResolver; -import org.jboss.portal.portlet.Properties; import org.jboss.portal.server.ServerRequest; import org.jboss.portal.theme.LayoutService; import org.jboss.portal.theme.RuntimeContext; @@ -198,7 +197,7 @@ public static ServerRequest createServerRequest() { - final HttpServletRequest clientRequest = new TestHttpServletRequest(); + // final HttpServletRequest clientRequest = new TestHttpServletRequest(); return new ServerRequest(null); } Modified: branches/JBoss_Portal_Branch_2_6/widget/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/.classpath 2007-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/widget/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -2,7 +2,6 @@ <classpath> <classpathentry kind="src" path="src/main"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/api"/> <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/> @@ -10,5 +9,6 @@ <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-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-09-11 06:52:17 UTC (rev 8213) +++ branches/JBoss_Portal_Branch_2_6/wsrp/.classpath 2007-09-11 07:27:07 UTC (rev 8214) @@ -5,7 +5,6 @@ <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="/server"/> - <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 kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/> @@ -25,12 +24,14 @@ <classpathentry combineaccessrules="false" kind="src" path="/jems"/> <classpathentry combineaccessrules="false" kind="src" path="/core"/> <classpathentry combineaccessrules="false" kind="src" path="/registration"/> - <classpathentry combineaccessrules="false" kind="src" path="/portlet-federation"/> <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/> <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="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-federation-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath>