JBoss Portal SVN: r8040 - in modules/test/trunk/test/src: main/org/jboss/portal/test/framework/impl/jboss and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-22 16:01:52 -0400 (Wed, 22 Aug 2007)
New Revision: 8040
Added:
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/MBeanServerFactory.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/RemoteMBeanProxy.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/RemoteMBeanServerAdapter.java
Removed:
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/jmx/
Modified:
modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml
modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml
Log:
moved the jboss as dependent classes to the impl/jboss package
Copied: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/MBeanServerFactory.java (from rev 8025, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/jmx/MBeanServerFactory.java)
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/MBeanServerFactory.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/MBeanServerFactory.java 2007-08-22 20:01:52 UTC (rev 8040)
@@ -0,0 +1,131 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.impl.jboss.jmx;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerConnection;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+import java.util.Properties;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5498 $
+ */
+public class MBeanServerFactory
+{
+
+ /** . */
+ private MBeanServer server;
+
+ /** . */
+ private Properties env;
+
+ public Properties getEnv()
+ {
+ return env;
+ }
+
+ public void setEnv(Properties env)
+ {
+ this.env = env;
+ }
+
+ public void create()
+ {
+ }
+
+ public void start() throws Exception
+ {
+ LazyMBeanServer lms = new LazyMBeanServer(env);
+ server = lms.getProxy();
+ }
+
+ public void stop()
+ {
+ server = null;
+ }
+
+ public void destroy()
+ {
+ }
+
+ public MBeanServer getServer() throws Exception
+ {
+ return server;
+ }
+
+ private static class LazyMBeanServer implements InvocationHandler
+ {
+
+ private Properties env;
+ private MBeanServerConnection remoteServer;
+ private MBeanServer proxy;
+
+ public LazyMBeanServer(Properties env)
+ {
+ this.env = env;
+ this.proxy = (MBeanServer)Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[]{MBeanServer.class}, this);
+ }
+
+ public MBeanServer getProxy()
+ {
+ return proxy;
+ }
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+ {
+ if (remoteServer == null)
+ {
+ InitialContext ctx = null;
+ try
+ {
+ ctx = new InitialContext(env);
+ MBeanServerConnection adaptor = (MBeanServerConnection)ctx.lookup("jmx/invoker/RMIAdaptor");
+ remoteServer = new RemoteMBeanServerAdapter(adaptor).getServer();
+ }
+ finally
+ {
+ if (ctx != null)
+ {
+ try
+ {
+ ctx.close();
+ }
+ catch (NamingException ignore)
+ {
+ }
+ }
+ }
+ }
+ Method adaptedMethod = MBeanServerConnection.class.getMethod(method.getName(), method.getParameterTypes());
+ return adaptedMethod.invoke(remoteServer, args);
+ }
+ }
+
+
+}
Property changes on: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/MBeanServerFactory.java
___________________________________________________________________
Name: svn:executable
+
Copied: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/RemoteMBeanProxy.java (from rev 8025, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanProxy.java)
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/RemoteMBeanProxy.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/RemoteMBeanProxy.java 2007-08-22 20:01:52 UTC (rev 8040)
@@ -0,0 +1,43 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.impl.jboss.jmx;
+
+import org.jboss.mx.util.MBeanProxy;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerConnection;
+import javax.management.ObjectName;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5498 $
+ */
+public class RemoteMBeanProxy
+{
+ public static Object get(Class itf, ObjectName name, MBeanServerConnection remoteServer) throws Exception
+ {
+ MBeanServer server = new RemoteMBeanServerAdapter(remoteServer).getServer();
+ return MBeanProxy.get(itf, name, server);
+ }
+}
Property changes on: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/RemoteMBeanProxy.java
___________________________________________________________________
Name: svn:executable
+
Copied: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/RemoteMBeanServerAdapter.java (from rev 8025, modules/test/trunk/test/src/main/org/jboss/portal/test/framework/jmx/RemoteMBeanServerAdapter.java)
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/RemoteMBeanServerAdapter.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/RemoteMBeanServerAdapter.java 2007-08-22 20:01:52 UTC (rev 8040)
@@ -0,0 +1,58 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.impl.jboss.jmx;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerConnection;
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5498 $
+ */
+public class RemoteMBeanServerAdapter implements InvocationHandler
+{
+
+ private MBeanServerConnection remoteServer;
+ private MBeanServer adaptedServer;
+
+ public RemoteMBeanServerAdapter(MBeanServerConnection remoteServer)
+ {
+ this.remoteServer = remoteServer;
+ this.adaptedServer = (MBeanServer)Proxy.newProxyInstance(Thread.currentThread().getContextClassLoader(), new Class[]{MBeanServer.class}, this);
+ }
+
+ public MBeanServer getServer()
+ {
+ return adaptedServer;
+ }
+
+ public Object invoke(Object proxy, Method method, Object[] args) throws Throwable
+ {
+ Method adaptedMethod = MBeanServerConnection.class.getMethod(method.getName(), method.getParameterTypes());
+ return adaptedMethod.invoke(remoteServer, args);
+ }
+}
Property changes on: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/impl/jboss/jmx/RemoteMBeanServerAdapter.java
___________________________________________________________________
Name: svn:executable
+
Modified: modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml
===================================================================
--- modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-22 20:00:59 UTC (rev 8039)
+++ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-22 20:01:52 UTC (rev 8040)
@@ -27,7 +27,7 @@
xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer">
- <bean name="MBeanServerFactory0" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory">
+ <bean name="MBeanServerFactory0" class="org.jboss.portal.test.framework.impl.jboss.jmx.MBeanServerFactory">
<property name="env">
<map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
@@ -62,7 +62,7 @@
</constructor>
</bean>
- <bean name="MBeanServerFactory1" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory">
+ <bean name="MBeanServerFactory1" class="org.jboss.portal.test.framework.impl.jboss.jmx.MBeanServerFactory">
<property name="env">
<map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
@@ -97,7 +97,7 @@
</constructor>
</bean>
- <bean name="MBeanServerFactory2" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory">
+ <bean name="MBeanServerFactory2" class="org.jboss.portal.test.framework.impl.jboss.jmx.MBeanServerFactory">
<property name="env">
<map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
Modified: modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml
===================================================================
--- modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml 2007-08-22 20:00:59 UTC (rev 8039)
+++ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml 2007-08-22 20:01:52 UTC (rev 8040)
@@ -27,7 +27,7 @@
xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd"
xmlns="urn:jboss:bean-deployer">
- <bean name="MBeanServerFactory0" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory">
+ <bean name="MBeanServerFactory0" class="org.jboss.portal.test.framework.impl.jboss.jmx.MBeanServerFactory">
<property name="env">
<map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
@@ -62,7 +62,7 @@
</constructor>
</bean>
- <bean name="MBeanServerFactory1" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory">
+ <bean name="MBeanServerFactory1" class="org.jboss.portal.test.framework.impl.jboss.jmx.MBeanServerFactory">
<property name="env">
<map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
@@ -97,7 +97,7 @@
</constructor>
</bean>
- <bean name="MBeanServerFactory2" class="org.jboss.portal.test.framework.jmx.MBeanServerFactory">
+ <bean name="MBeanServerFactory2" class="org.jboss.portal.test.framework.impl.jboss.jmx.MBeanServerFactory">
<property name="env">
<map class="java.util.Properties" keyClass="java.lang.String" valueClass="java.lang.String">
<entry>
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8039 - in modules/portlet/trunk: test and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-22 16:00:59 -0400 (Wed, 22 Aug 2007)
New Revision: 8039
Modified:
modules/portlet/trunk/jboss-portal-portlet.iws
modules/portlet/trunk/test/build.xml
modules/portlet/trunk/tools/lib/junit.jar
Log:
moved the jboss as dependent classes to the impl/jboss package
Modified: modules/portlet/trunk/jboss-portal-portlet.iws
===================================================================
--- modules/portlet/trunk/jboss-portal-portlet.iws 2007-08-22 19:57:38 UTC (rev 8038)
+++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-08-22 20:00:59 UTC (rev 8039)
@@ -17,15 +17,8 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" afterPath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/build.xml" afterPath="$PROJECT_DIR$/test/build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/lib/junit.jar" afterPath="$PROJECT_DIR$/tools/lib/junit.jar" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -156,87 +149,60 @@
<component name="FavoritesProjectViewPane" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="jboss-beans.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml">
+ <file leaf-file-name="PortalServlet.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="19" column="64" selection-start="854" selection-end="854" vertical-scroll-proportion="0.21105528">
+ <state line="54" column="13" selection-start="3091" selection-end="3091" vertical-scroll-proportion="0.1356784">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="PortletTestDriver.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java">
+ <file leaf-file-name="web.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="46" column="42" selection-start="2794" selection-end="2794" vertical-scroll-proportion="0.16276202">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="AbstractInfoTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java">
+ <file leaf-file-name="JBossApplicationMetaDataFactory.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="50" selection-start="2741" selection-end="2741" vertical-scroll-proportion="0.13316892">
+ <state line="43" column="26" selection-start="2605" selection-end="2605" vertical-scroll-proportion="-0.5427136">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="SecurityInfoTest.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java">
+ <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/test/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="108" selection-start="2139" selection-end="2139" vertical-scroll-proportion="0.044389643">
+ <state line="234" column="63" selection-start="11861" selection-end="11861" vertical-scroll-proportion="0.50308263">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="ExceptionsDuringRequestHandlingControllerPortlet.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java">
+ <file leaf-file-name="buildmagic.ent" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent">
<provider selected="true" editor-type-id="text-editor">
- <state line="90" column="15" selection-start="4984" selection-end="4984" vertical-scroll-proportion="0.6080402">
+ <state line="657" column="27" selection-start="24049" selection-end="24055" vertical-scroll-proportion="0.18216081">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="PortletExceptionDuringRequestHandlingPortlet.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java">
+ <file leaf-file-name="SessionTestCase.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="68" column="77" selection-start="3677" selection-end="3677" vertical-scroll-proportion="0.55778897">
+ <state line="31" column="13" selection-start="2040" selection-end="2040" vertical-scroll-proportion="0.13316892">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="RuntimeExceptionDuringRequestHandlingPortlet.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="70" column="77" selection-start="3818" selection-end="3818" vertical-scroll-proportion="0.5879397">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="UnavailableExceptionDuringProcessActionPortlet.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="68" column="77" selection-start="3593" selection-end="3593" vertical-scroll-proportion="0.55778897">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="UnavailableExceptionDuringRenderPortlet.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="55" column="52" selection-start="3167" selection-end="3167" vertical-scroll-proportion="0.38471022">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -836,7 +802,7 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/metadata" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
@@ -870,44 +836,10 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/deployment" />
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
- <PATH>
- <PATH_ELEMENT>
- <option name="myItemId" value="jboss-portal-portlet.ipr" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="portlet" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- <PATH_ELEMENT>
- <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/container" />
- <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
- </PATH_ELEMENT>
- </PATH>
</subPane>
</component>
<component name="ProjectReloadState">
@@ -947,25 +879,6 @@
</component>
<component name="RestoreUpdateTree" />
<component name="RunManager" selected="Remote.Unnamed">
- <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
- <method>
- <option name="Make" value="true" />
- </method>
- </configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
<option name="VM_PARAMETERS" />
@@ -995,6 +908,25 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
+ <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <method>
+ <option name="Make" value="true" />
+ </method>
+ </configuration>
<configuration default="false" name="Unnamed" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -1209,107 +1141,107 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/portlet/build.xml">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="227" column="56" selection-start="11875" selection-end="11875" vertical-scroll-proportion="0.77681875">
+ <state line="68" column="77" selection-start="3593" selection-end="3593" vertical-scroll-proportion="0.55778897">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/build.xml">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="162" column="93" selection-start="8435" selection-end="8435" vertical-scroll-proportion="0.30456227">
+ <state line="70" column="77" selection-start="3818" selection-end="3818" vertical-scroll-proportion="0.5879397">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="7" selection-start="2114" selection-end="2114" vertical-scroll-proportion="0.19235511">
+ <state line="68" column="77" selection-start="3677" selection-end="3677" vertical-scroll-proportion="0.55778897">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="101" column="31" selection-start="4316" selection-end="4316" vertical-scroll-proportion="0.5437731">
+ <state line="90" column="15" selection-start="4984" selection-end="4984" vertical-scroll-proportion="0.6407035">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="12" selection-start="2174" selection-end="2174" vertical-scroll-proportion="0.20715167">
+ <state line="41" column="50" selection-start="2741" selection-end="2741" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$PROJECT_DIR$/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.class">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="20" selection-start="196" selection-end="196" vertical-scroll-proportion="0.05918619">
+ <state line="46" column="42" selection-start="2794" selection-end="2794" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="19" column="64" selection-start="854" selection-end="854" vertical-scroll-proportion="0.21105528">
+ <state line="29" column="108" selection-start="2139" selection-end="2139" vertical-scroll-proportion="0.044389643">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java">
+ <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="46" column="42" selection-start="2794" selection-end="2794" vertical-scroll-proportion="0.16276202">
+ <state line="19" column="64" selection-start="854" selection-end="854" vertical-scroll-proportion="0.015075377">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java">
+ <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalServlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="41" column="50" selection-start="2741" selection-end="2741" vertical-scroll-proportion="0.13316892">
+ <state line="54" column="13" selection-start="3091" selection-end="3091" vertical-scroll-proportion="0.1356784">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java">
+ <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/web.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="29" column="108" selection-start="2139" selection-end="2139" vertical-scroll-proportion="0.044389643">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/metadata/SecurityConstraintMetaData.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="90" column="15" selection-start="4984" selection-end="4984" vertical-scroll-proportion="0.6080402">
+ <state line="31" column="13" selection-start="1972" selection-end="1972" vertical-scroll-proportion="0.13316892">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/deployment/JBossApplicationMetaDataFactory.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="68" column="77" selection-start="3677" selection-end="3677" vertical-scroll-proportion="0.55778897">
+ <state line="43" column="26" selection-start="2605" selection-end="2605" vertical-scroll-proportion="-0.5427136">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java">
+ <entry file="file://$PROJECT_DIR$/test/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="70" column="77" selection-start="3818" selection-end="3818" vertical-scroll-proportion="0.5879397">
+ <state line="234" column="63" selection-start="11861" selection-end="11861" vertical-scroll-proportion="0.50308263">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java">
+ <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent">
<provider selected="true" editor-type-id="text-editor">
- <state line="68" column="77" selection-start="3593" selection-end="3593" vertical-scroll-proportion="0.55778897">
+ <state line="657" column="27" selection-start="24049" selection-end="24055" vertical-scroll-proportion="0.18216081">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="55" column="52" selection-start="3167" selection-end="3167" vertical-scroll-proportion="0.38471022">
+ <state line="31" column="13" selection-start="2040" selection-end="2040" vertical-scroll-proportion="0.13316892">
<folding />
</state>
</provider>
Modified: modules/portlet/trunk/test/build.xml
===================================================================
--- modules/portlet/trunk/test/build.xml 2007-08-22 19:57:38 UTC (rev 8038)
+++ modules/portlet/trunk/test/build.xml 2007-08-22 20:00:59 UTC (rev 8039)
@@ -232,7 +232,7 @@
<execute-tests>
<x-test>
<zest todir="${test.reports}"
- name="org.jboss.portal.test.framework.runner.GenericHTTPTestRunner"
+ name="org.jboss.portal.test.framework.runner.HTTPTestRunner"
outfile="TEST-org.jboss.portal.test.portlet.info.InfoTestCase"
id="org.jboss.portal.test.portlet.info.InfoTestCase">
<parameter name="archive" value="test-jsr168-api-actionrequest.war"/>
Modified: modules/portlet/trunk/tools/lib/junit.jar
===================================================================
(Binary files differ)
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8038 - in branches/2_6_CAS_Integration: core/src/main/org/jboss/portal/core/model/portal and 7 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2007-08-22 15:57:38 -0400 (Wed, 22 Aug 2007)
New Revision: 8038
Added:
branches/2_6_CAS_Integration/identity/josso/
branches/2_6_CAS_Integration/identity/josso/config/
branches/2_6_CAS_Integration/identity/josso/config/context.xml
branches/2_6_CAS_Integration/identity/josso/config/error.jsp
branches/2_6_CAS_Integration/identity/josso/config/josso-1.5.jar
branches/2_6_CAS_Integration/identity/josso/config/josso-agent-config.xml
branches/2_6_CAS_Integration/identity/josso/config/josso-common-1.5.jar
branches/2_6_CAS_Integration/identity/josso/config/josso-config.xml
branches/2_6_CAS_Integration/identity/josso/config/josso-gateway-config.xml
branches/2_6_CAS_Integration/identity/josso/config/josso-jboss4-plugin-1.5.jar
branches/2_6_CAS_Integration/identity/josso/config/josso-tomcat55-plugin-1.5.jar
branches/2_6_CAS_Integration/identity/josso/config/login-config.xml
branches/2_6_CAS_Integration/identity/josso/config/login.jsp
branches/2_6_CAS_Integration/identity/josso/config/server.xml
branches/2_6_CAS_Integration/identity/josso/lib/
branches/2_6_CAS_Integration/identity/josso/lib/josso-1.5.jar
branches/2_6_CAS_Integration/identity/josso/lib/josso-jboss4-plugin-1.5.jar
branches/2_6_CAS_Integration/identity/josso/lib/josso-tomcat55-plugin-1.5.jar
branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOIdentityService.java
branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOIdentityServiceImpl.java
branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOIdentityStore.java
branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOLoginModule.java
branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOLogoutValve.java
Modified:
branches/2_6_CAS_Integration/core/build.xml
branches/2_6_CAS_Integration/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java
branches/2_6_CAS_Integration/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
branches/2_6_CAS_Integration/identity/build.xml
branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/CASAuthenticationService.java
branches/2_6_CAS_Integration/thirdparty/
Log:
JOSSO Single Sign On Framework integration
Modified: branches/2_6_CAS_Integration/core/build.xml
===================================================================
--- branches/2_6_CAS_Integration/core/build.xml 2007-08-22 17:39:30 UTC (rev 8037)
+++ branches/2_6_CAS_Integration/core/build.xml 2007-08-22 19:57:38 UTC (rev 8038)
@@ -743,6 +743,7 @@
</copy>
</target>
+ <!-- Deploying the CAS SSO Framework integration -->
<target name="deploy-cas" depends="deploy-explode">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
<delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/lib/casclient-lenient.jar"/>
@@ -774,5 +775,29 @@
<copy todir="${jboss.home}/server/${portal.deploy.dir}/cas.war/WEB-INF/lib" overwrite="true">
<fileset dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/lib" includes="portal-identity-lib.jar"/>
</copy>
- </target>
+ </target>
+
+
+ <!-- Deploying the JOSSO SSO Framework integration -->
+ <target name="deploy-josso" depends="deploy-explode">
+ <require file="${jboss.home}/server/${portal.deploy.dir}"/>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}/../conf" overwrite="true">
+ <fileset dir="../identity/josso/config" includes="josso-agent-config.xml, josso-config.xml, login-config.xml"/>
+ </copy>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}/jbossweb-tomcat55.sar" overwrite="true">
+ <fileset dir="../identity/josso/config" includes="server.xml, josso-1.5.jar, josso-common-1.5.jar, josso-jboss4-plugin-1.5.jar, josso-tomcat55-plugin-1.5.jar"/>
+ </copy>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/portal-server.war" overwrite="true">
+ <fileset dir="../identity/josso/config" includes="login.jsp, error.jsp"/>
+ </copy>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/portal-server.war/WEB-INF" overwrite="true">
+ <fileset dir="../identity/josso/config" includes="context.xml"/>
+ </copy>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}/josso.war/WEB-INF/classes" overwrite="true">
+ <fileset dir="../identity/josso/config" includes="josso-gateway-config.xml"/>
+ </copy>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}/josso.war/WEB-INF/lib" overwrite="true">
+ <fileset dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/lib" includes="portal-identity-lib.jar"/>
+ </copy>
+ </target>
</project>
Modified: branches/2_6_CAS_Integration/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java
===================================================================
--- branches/2_6_CAS_Integration/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java 2007-08-22 17:39:30 UTC (rev 8037)
+++ branches/2_6_CAS_Integration/core/src/main/org/jboss/portal/core/model/portal/PortalObjectPermission.java 2007-08-22 19:57:38 UTC (rev 8038)
@@ -29,6 +29,7 @@
import org.jboss.portal.security.spi.provider.PermissionRepository;
import javax.security.auth.Subject;
+import java.security.Principal;
import java.security.Permission;
import java.util.Collection;
import java.util.Iterator;
@@ -273,7 +274,7 @@
caller != null &&
thisPath.getLength() < thatPath.getLength())
{
- Set tmp = caller.getPrincipals(UserPrincipal.class);
+ Set tmp = caller.getPrincipals();
if (tmp.size() > 0)
{
Iterator i1 = thisPath.names();
@@ -292,7 +293,7 @@
//
Iterator i = tmp.iterator();
- UserPrincipal user = (UserPrincipal)i.next();
+ Principal user = (Principal)i.next();
String userName = user.getName();
//
Modified: branches/2_6_CAS_Integration/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/2_6_CAS_Integration/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-08-22 17:39:30 UTC (rev 8037)
+++ branches/2_6_CAS_Integration/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-08-22 19:57:38 UTC (rev 8038)
@@ -529,6 +529,14 @@
<depends>portal:service=Module,type=IdentityServiceController</depends>
<attribute name="HavingRole"></attribute>
</mbean>
+ <mbean
+ code="org.jboss.portal.identity.auth.JOSSOIdentityServiceImpl"
+ name="portal:service=Module,type=JOSSOIdentityService"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends>portal:service=Module,type=IdentityServiceController</depends>
+ </mbean>
<mbean
code="org.jboss.portal.core.impl.mail.MailModuleImpl"
Modified: branches/2_6_CAS_Integration/identity/build.xml
===================================================================
--- branches/2_6_CAS_Integration/identity/build.xml 2007-08-22 17:39:30 UTC (rev 8037)
+++ branches/2_6_CAS_Integration/identity/build.xml 2007-08-22 19:57:38 UTC (rev 8038)
@@ -89,7 +89,7 @@
<!-- Configure thirdparty libraries -->
&libraries;
- <!--TODO: need to add the CAS SSO system dependency to the thirdparty repository. For now, this is just added to identity/cas/lib -->
+ <!--TODO: need to add the CAS/JOSSO SSO system dependency to the thirdparty repository. For now, this is just added to identity/cas/lib -->
<property name="yale.cas.root" value="cas"/>
<property name="yale.cas.lib" value="${yale.cas.root}/lib/"/>
<path id="yale.cas.classpath">
@@ -98,6 +98,14 @@
<pathelement path="${yale.cas.lib}/catalina.jar"/>
<pathelement path="${yale.cas.lib}/spring-2.0.3.jar"/>
</path>
+
+ <property name="josso.root" value="josso"/>
+ <property name="josso.lib" value="${josso.root}/lib/"/>
+ <path id="josso.classpath">
+ <pathelement path="${josso.lib}/josso-1.5.jar"/>
+ <pathelement path="${josso.lib}/josso-tomcat55-plugin-1.5.jar"/>
+ <pathelement path="${josso.lib}/josso-jboss4-plugin-1.5.jar"/>
+ </path>
<path id="library.classpath">
<path refid="sun.servlet.classpath"/>
@@ -114,6 +122,7 @@
<!-- cas integration -->
<path refid="sun.servlet.classpath"/>
<path refid="yale.cas.classpath"/>
+ <path refid="josso.classpath"/>
<path refid="apache.httpclient.classpath"/>
</path>
Added: branches/2_6_CAS_Integration/identity/josso/config/context.xml
===================================================================
--- branches/2_6_CAS_Integration/identity/josso/config/context.xml (rev 0)
+++ branches/2_6_CAS_Integration/identity/josso/config/context.xml 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,4 @@
+<?xml version="1.0"?>
+<Context>
+ <Valve className="org.jboss.portal.identity.auth.JOSSOLogoutValve"/>
+</Context>
Added: branches/2_6_CAS_Integration/identity/josso/config/error.jsp
===================================================================
--- branches/2_6_CAS_Integration/identity/josso/config/error.jsp (rev 0)
+++ branches/2_6_CAS_Integration/identity/josso/config/error.jsp 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,41 @@
+<%--
+ ~ Copyright (c) 2004-2006, Novascope S.A. and the JOSSO team
+ ~ All rights reserved.
+ ~ Redistribution and use in source and binary forms, with or
+ ~ without modification, are permitted provided that the following
+ ~ conditions are met:
+ ~
+ ~ * Redistributions of source code must retain the above copyright
+ ~ notice, this list of conditions and the following disclaimer.
+ ~
+ ~ * Redistributions in binary form must reproduce the above copyright
+ ~ notice, this list of conditions and the following disclaimer in
+ ~ the documentation and/or other materials provided with the
+ ~ distribution.
+ ~
+ ~ * Neither the name of the JOSSO team nor the names of its
+ ~ contributors may be used to endorse or promote products derived
+ ~ from this software without specific prior written permission.
+ ~
+ ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ ~ CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ ~ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ ~ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ ~ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ ~ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ ~ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ ~ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ ~ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ ~ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ ~ POSSIBILITY OF SUCH DAMAGE.
+ --%>
+
+<%@page contentType="text/html; charset=iso-8859-1" language="java" session="true" %>
+<!--
+Redirects the user to the propper login page. Configured as the login url the web.xml for this application.
+-->
+<%
+ response.sendRedirect(request.getContextPath() + "/josso_login/");
+%>
Added: branches/2_6_CAS_Integration/identity/josso/config/josso-1.5.jar
===================================================================
(Binary files differ)
Property changes on: branches/2_6_CAS_Integration/identity/josso/config/josso-1.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/2_6_CAS_Integration/identity/josso/config/josso-agent-config.xml
===================================================================
--- branches/2_6_CAS_Integration/identity/josso/config/josso-agent-config.xml (rev 0)
+++ branches/2_6_CAS_Integration/identity/josso/config/josso-agent-config.xml 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<agent>
+ <class>org.josso.jb4.agent.JBossCatalinaSSOAgent</class>
+ <gatewayLoginUrl>http://localhost:8080/josso/signon/login.do</gatewayLoginUrl>
+ <gatewayLogoutUrl>http://localhost:8080/josso/signon/logout.do</gatewayLogoutUrl>
+ <service-locator>
+ <class>org.josso.gateway.WebserviceGatewayServiceLocator</class>
+ <endpoint>localhost:8080</endpoint>
+ </service-locator>
+ <partner-apps>
+ <partner-app>
+ <context>/portal</context>
+ </partner-app>
+ </partner-apps>
+</agent>
Added: branches/2_6_CAS_Integration/identity/josso/config/josso-common-1.5.jar
===================================================================
(Binary files differ)
Property changes on: branches/2_6_CAS_Integration/identity/josso/config/josso-common-1.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/2_6_CAS_Integration/identity/josso/config/josso-config.xml
===================================================================
--- branches/2_6_CAS_Integration/identity/josso/config/josso-config.xml (rev 0)
+++ branches/2_6_CAS_Integration/identity/josso/config/josso-config.xml 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<configuration>
+ <hierarchicalXml fileName="josso-agent-config.xml"/>
+</configuration>
Added: branches/2_6_CAS_Integration/identity/josso/config/josso-gateway-config.xml
===================================================================
--- branches/2_6_CAS_Integration/identity/josso/config/josso-gateway-config.xml (rev 0)
+++ branches/2_6_CAS_Integration/identity/josso/config/josso-gateway-config.xml 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,569 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+ ~ Copyright (c) 2004-2006, Novascope S.A. and the JOSSO team
+ ~ All rights reserved.
+ ~ Redistribution and use in source and binary forms, with or
+ ~ without modification, are permitted provided that the following
+ ~ conditions are met:
+ ~
+ ~ * Redistributions of source code must retain the above copyright
+ ~ notice, this list of conditions and the following disclaimer.
+ ~
+ ~ * Redistributions in binary form must reproduce the above copyright
+ ~ notice, this list of conditions and the following disclaimer in
+ ~ the documentation and/or other materials provided with the
+ ~ distribution.
+ ~
+ ~ * Neither the name of the JOSSO team nor the names of its
+ ~ contributors may be used to endorse or promote products derived
+ ~ from this software without specific prior written permission.
+ ~
+ ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ ~ CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ ~ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ ~ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ ~ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ ~ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ ~ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ ~ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ ~ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ ~ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ ~ POSSIBILITY OF SUCH DAMAGE.
+ -->
+
+<domain>
+ <name>JOSSO</name>
+ <type>web</type>
+
+ <!--sso-web-config-->
+
+ <!-- Optional : The URL where the user will be redirected after a successfull login only if josso_back_to request parameter
+ is not present when accessing the login url
+ <loginBackToURL>http://localhost:8080/partnerapp/protected/</loginBackToURL>
+ -->
+
+ <!-- Optional : The URL where the user will be redirected after a logout only if josso_back_to is not present
+ when accessing the logout url
+ <logoutBackToURL>http://localhost:8080/partnerapp/protected/</logoutBackToURL>
+ -->
+
+ <!-- Session token properties -->
+ <!--session-token-->
+
+ <!-- Optional : Use a secure session token, a secure channel like SSL must be available for this to work
+ <secure>false</secure>
+ -->
+
+
+ <!--/session-token-->
+
+ <!--/sso-web-config-->
+
+ <authenticator>
+ <class>org.josso.auth.AuthenticatorImpl</class>
+ <authentication-schemes>
+ <!-- Basic Authentication Scheme -->
+ <authentication-scheme>
+ <name>basic-authentication</name>
+ <class>org.josso.auth.scheme.BindUsernamePasswordAuthScheme</class>
+
+ <!--
+ The message digest algorithm to be used when hashing passwords.
+ This must be an algorithm supported by the java.security.MessageDigest class
+ on your platform.
+
+ In J2SE 1.4.2 you can check :
+ Java Cryptography Architecture API Specification & Reference - Apendix B : Algorithms
+ Values are : MD2, MD5, SHA-1, SHA-256, SHA-384, SHA-512,etc.
+
+ To provide LDAP support, also CRYPT is available.
+ -->
+ <!--
+ <hashAlgorithm>MD5</hashAlgorithm>
+ -->
+
+ <!-- Supported values are HEX, BASE64. Mandatory if hashAlgorithm was specified -->
+ <!--
+ <hashEncoding>HEX</hashEncoding>
+ -->
+
+ <!-- Some hash algorithms, like CRYPT, use this property. The default value is 2.
+ <saltLength>2</saltLength>
+ -->
+
+ <!--
+ <ignorePasswordCase>false</ignorePasswordCase>
+ <ignoreUserCase>false</ignoreUserCase>
+ -->
+ <!-- ========================================================= -->
+ <!-- JDBC Credential Store -->
+ <!-- -->
+ <!-- Always scape comma chars [,] in queries because -->
+ <!-- jakarta commons-configuration uses them to define arrays. -->
+ <!-- ========================================================= -->
+ <!--
+ <credential-store>
+ <class>org.josso.gateway.identity.service.store.db.JDBCIdentityStore</class>
+
+ <credentialsQueryString>
+
+ SELECT login AS username , password AS password FROM josso_user WHERE login = ?
+
+ </credentialsQueryString>
+ <connectionName>josso</connectionName>
+ <connectionPassword>josso</connectionPassword>
+ <connectionURL>jdbc:oracle:thin:@localhost:1521:josso_db</connectionURL>
+ <driverName>oracle.jdbc.driver.OracleDriver</driverName>
+ </credential-store>
+ <credential-store>
+ <class>org.josso.gateway.identity.service.store.db.DataSourceIdentityStore</class>
+
+ <credentialsQueryString>SELECT login AS username , password AS password FROM josso_user WHERE login = ?</credentialsQueryString>
+ <dsJndiName>java:jdbc/JossoSamplesDB</dsJndiName>
+ </credential-store>
+ -->
+
+ <!-- =============================================================== -->
+ <!-- LDAP Credential Store -->
+ <!-- -->
+ <!-- Chcek javadoc for configuration details : -->
+ <!-- org.josso.gateway.identity.service.store.ldap.LDAPIdentityStore -->
+ <!-- =============================================================== -->
+ <!--
+ <credential-store>
+ <class>org.josso.gateway.identity.service.store.ldap.LDAPIdentityStore</class>
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://ldaphost</providerUrl>
+ <securityPrincipal>cn=Manager,dc=my-domain,dc=com</securityPrincipal>
+ <securityCredential>secret</securityCredential>
+ <securityAuthentication>simple</securityAuthentication>
+ <ldapSearchScope>SUBTREE</ldapSearchScope>
+ <usersCtxDN>ou=People,dc=my-domain,dc=com</usersCtxDN>
+ <principalUidAttributeID>uid</principalUidAttributeID>
+ <rolesCtxDN>ou=Roles,dc=my-domain,dc=com</rolesCtxDN>
+ <uidAttributeID>uniquemember</uidAttributeID>
+ <roleAttributeID>cn</roleAttributeID>
+ <credentialQueryString>uid=username,userPassword=password</credentialQueryString>
+ <userPropertiesQueryString>mail=mail,cn=description</userPropertiesQueryString>
+ </credential-store>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Memory Credential Store -->
+ <!-- ================================================= -->
+ <!--
+ <credential-store>
+ <class>org.josso.gateway.identity.service.store.MemoryIdentityStore</class>
+ <credentialsFileName>josso-credentials.xml</credentialsFileName>
+ </credential-store>
+ -->
+
+ <!-- ================================================= -->
+ <!-- JBoss Portal Credential Store -->
+ <!-- ================================================= -->
+ <credential-store>
+ <class>org.jboss.portal.identity.auth.JOSSOIdentityStore</class>
+ </credential-store>
+
+
+
+ <!-- ================================================= -->
+ <!-- Credential Store Key adapter -->
+ <!-- ================================================= -->
+ <credential-store-key-adapter>
+ <class>org.josso.gateway.identity.service.store.SimpleIdentityStoreKeyAdapter</class>
+ </credential-store-key-adapter>
+
+ </authentication-scheme>
+
+ <!-- Strong Authentication Scheme -->
+ <authentication-scheme>
+ <name>strong-authentication</name>
+ <class>org.josso.auth.scheme.X509CertificateAuthScheme</class>
+
+ <!-- ========================================================= -->
+ <!-- JDBC Credential Store -->
+ <!-- -->
+ <!-- Always scape comma chars [,] in queries because -->
+ <!-- jakarta commons-configuration uses them to define arrays. -->
+ <!-- ========================================================= -->
+ <!--
+ <credential-store>
+ <class>org.josso.gateway.identity.service.store.db.JDBCIdentityStore</class>
+
+ <credentialsQueryString>
+
+ SELECT login AS username , password AS password FROM josso_user WHERE login = ?
+
+ </credentialsQueryString>
+ <connectionName>josso</connectionName>
+ <connectionPassword>josso</connectionPassword>
+ <connectionURL>jdbc:oracle:thin:@localhost:1521:josso_db</connectionURL>
+ <driverName>oracle.jdbc.driver.OracleDriver</driverName>
+ </credential-store>
+ -->
+
+ <!-- =============================================================== -->
+ <!-- LDAP Credential Store -->
+ <!-- -->
+ <!-- Chcek javadoc for configuration details : -->
+ <!-- org.josso.gateway.identity.service.store.ldap.LDAPIdentityStore -->
+ <!-- =============================================================== -->
+ <!--
+ <credential-store>
+ <class>org.josso.gateway.identity.service.store.ldap.LDAPIdentityStore</class>
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://ldaphost</providerUrl>
+ <securityPrincipal>cn=Manager,dc=my-domain,dc=com</securityPrincipal>
+ <securityCredential>secret</securityCredential>
+ <securityAuthentication>simple</securityAuthentication>
+ <ldapSearchScope>SUBTREE</ldapSearchScope>
+ <usersCtxDN>ou=People,dc=my-domain,dc=com</usersCtxDN>
+ <principalUidAttributeID>uid</principalUidAttributeID>
+ <rolesCtxDN>ou=Roles,dc=my-domain,dc=com</rolesCtxDN>
+ <uidAttributeID>uniquemember</uidAttributeID>
+ <roleAttributeID>cn</roleAttributeID>
+ <credentialQueryString>uid=username,userCertificate;binary=userCertificate</credentialQueryString>
+ <userPropertiesQueryString>mail=mail,cn=description</userPropertiesQueryString>
+ </credential-store>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Memory Credential Store -->
+ <!-- ================================================= -->
+ <credential-store>
+ <class>org.josso.gateway.identity.service.store.MemoryIdentityStore</class>
+ <credentialsFileName>josso-credentials.xml</credentialsFileName>
+ </credential-store>
+
+ <!-- ================================================= -->
+ <!-- Credential Store Key adapter -->
+ <!-- ================================================= -->
+ <credential-store-key-adapter>
+ <class>org.josso.gateway.identity.service.store.SimpleIdentityStoreKeyAdapter</class>
+ </credential-store-key-adapter>
+
+ </authentication-scheme>
+ </authentication-schemes>
+ </authenticator>
+
+ <sso-identity-manager>
+
+ <class>org.josso.gateway.identity.service.SSOIdentityManagerImpl</class>
+
+ <!-- ========================================================= -->
+ <!-- DataSource Identity Store -->
+ <!-- -->
+ <!-- Always scape comma chars [,] in queries because -->
+ <!-- jakarta commons-configuration uses them to define arrays. -->
+ <!-- ========================================================= -->
+ <!--
+ <sso-identity-store>
+ <class>org.josso.gateway.identity.service.store.db.DataSourceIdentityStore</class>
+
+ <userQueryString>
+ SELECT login FROM josso_user WHERE login = ?
+ </userQueryString>
+
+ <userPropertiesQueryString>
+ SELECT 'user.description' AS name , description AS value FROM josso_user WHERE login = ?
+ UNION
+ SELECT name AS name , value AS value FROM josso_user_property WHERE login = ?
+ </userPropertiesQueryString>
+
+ <rolesQueryString>
+ SELECT josso_role.name FROM josso_role , josso_user_role , josso_user WHERE josso_user.login = ? AND josso_user.login = josso_user_role.login AND josso_role.name = josso_user_role.name
+ </rolesQueryString>
+
+ <dsJndiName>java:jdbc/JossoSamplesDB</dsJndiName>
+ </sso-identity-store>
+ -->
+ <!-- ========================================================= -->
+ <!-- JDBC Identity Store -->
+ <!-- -->
+ <!-- Always scape comma chars [,] in queries because -->
+ <!-- jakarta commons-configuration uses them to define arrays. -->
+ <!-- ========================================================= -->
+
+ <!--sso-identity-store>
+ <class>org.josso.gateway.identity.service.store.db.JDBCIdentityStore</class>
+
+ <userQueryString>
+ SELECT login FROM josso_user WHERE login = ?
+ </userQueryString>
+
+ You could use a UNION to select properties from different tables/columns :
+ SELECT 'user.lastName' AS name , lastName AS value FROM josso_user WHERE login = ?
+ UNION
+ SELECT 'user.name' AS name , name AS value FROM josso_user WHERE login = ?
+ UNION
+ SELECT name AS name , value AS value FROM josso_user_properties WHERE login = ?
+
+ <userPropertiesQueryString>
+ SELECT 'user.description' AS name , description AS value FROM josso_user WHERE login = ?
+ UNION
+ SELECT name AS name , value AS value FROM josso_user_property WHERE login = ?
+ </userPropertiesQueryString>
+ <rolesQueryString>
+ SELECT josso_role.name FROM josso_role , josso_user_role , josso_user WHERE josso_user.login = ? AND josso_user.login = josso_user_role.login AND josso_role.name = josso_user_role.name
+ </rolesQueryString>
+ <connectionName>josso</connectionName>
+ <connectionPassword>josso</connectionPassword>
+ <connectionURL>jdbc:oracle:thin:@localhost:1521:josso_db</connectionURL>
+ <driverName>oracle.jdbc.driver.OracleDriver</driverName>
+ </sso-identity-store-->
+
+ <!-- =============================================================== -->
+ <!-- LDAP Identity Store -->
+ <!-- -->
+ <!-- Chcek javadoc for configuration details : -->
+ <!-- org.josso.gateway.identity.service.store.ldap.LDAPIdentityStore -->
+ <!-- ================================================= -->
+ <!--
+ <sso-identity-store>
+ <class>org.josso.gateway.identity.service.store.ldap.LDAPIdentityStore</class>
+ <initialContextFactory>com.sun.jndi.ldap.LdapCtxFactory</initialContextFactory>
+ <providerUrl>ldap://ldaphost</providerUrl>
+ <securityPrincipal>cn=Manager,dc=my-domain,dc=com</securityPrincipal>
+ <securityCredential>secret</securityCredential>
+ <securityAuthentication>simple</securityAuthentication>
+ <ldapSearchScope>SUBTREE</ldapSearchScope>
+ <usersCtxDN>ou=People,dc=my-domain,dc=com</usersCtxDN>
+ <principalUidAttributeID>uid</principalUidAttributeID>
+ <rolesCtxDN>ou=Roles,dc=my-domain,dc=com</rolesCtxDN>
+ <uidAttributeID>uniquemember</uidAttributeID>
+ <roleAttributeID>cn</roleAttributeID>
+ <credentialQueryString>uid=username,userPassword=password</credentialQueryString>
+ <userPropertiesQueryString>mail=mail,cn=description</userPropertiesQueryString>
+ </sso-identity-store>
+ -->
+
+ <!-- ================================================= -->
+ <!-- Memory Identity Store -->
+ <!-- ================================================= -->
+ <!--
+ <sso-identity-store>
+ <class>org.josso.gateway.identity.service.store.MemoryIdentityStore</class>
+ <usersFileName>josso-users.xml</usersFileName>
+ </sso-identity-store>
+ -->
+
+ <!-- ================================================= -->
+ <!-- JBoss Portal Credential Store -->
+ <!-- ================================================= -->
+ <sso-identity-store>
+ <class>org.jboss.portal.identity.auth.JOSSOIdentityStore</class>
+ </sso-identity-store>
+
+ <!-- ================================================= -->
+ <!-- Identity Store Key adapter -->
+ <!-- ================================================= -->
+ <sso-identity-store-key-adapter>
+ <class>org.josso.gateway.identity.service.store.SimpleIdentityStoreKeyAdapter</class>
+ </sso-identity-store-key-adapter>
+
+ </sso-identity-manager>
+
+ <sso-session-manager>
+
+ <class>org.josso.gateway.session.service.SSOSessionManagerImpl</class>
+
+ <!--
+ Set the maximum time interval, in minutes, between client requests before the SSO Service will invalidate
+ the session. A negative time indicates that the session should never time out.
+ -->
+ <maxInactiveInterval>30</maxInactiveInterval>
+
+ <!-- Max number of sessions per user, default 1
+ A negative value indicates that an unlimited number of sessions per user is allowed.
+ -->
+ <maxSessionsPerUser>-1</maxSessionsPerUser>
+ <!--
+ If true, when the max number of sessions per user is exceeded,
+ an already existing session will be invalidated to create a new one.
+ If false, when the max number of sessions per user is exceeded,
+ an exception is thrown and the new session is not created.
+ -->
+ <invalidateExceedingSessions>false</invalidateExceedingSessions>
+
+
+ <!--
+ Time interval, in milliseconds, between exired sessions cleanup.
+ -->
+ <sessionMonitorInterval>10000</sessionMonitorInterval>
+
+ <!-- =================================================================== -->
+ <!-- Serialized Session Store -->
+ <!-- -->
+ <!-- Session Store implementation which uses Java Serialization to -->
+ <!-- persist Single Sign-On user sessions. -->
+ <!-- It allows to reconstruct the session state after a system shutdown. -->
+ <!-- =================================================================== -->
+ <!--
+ <sso-session-store>
+ <class>org.josso.gateway.session.service.store.SerializedSessionStore</class>
+ file where serialized sessions will be stored (optional)
+ <serializedFile>/tmp/josso_sessions.ser</serializedFile>
+ </sso-session-store>
+ -->
+
+
+ <!-- =============================================================== -->
+ <!-- DataSource Session Store -->
+ <!-- -->
+ <!-- This store persists SSO sessions in a RDBMS, it's usefull for -->
+ <!-- example when multiple SSO servers must share session information-->
+ <!-- like in a cluster. -->
+ <!-- -->
+ <!-- NOTE :Remember to escape spetial chars like < with < , etc -->
+ <!-- -->
+ <!-- -->
+ <!-- Chcek javadoc for configuration details : -->
+ <!-- org.josso.gateway.session.service.store.db.DataSourceSessionStore -->
+ <!-- =============================================================== -->
+ <!--
+ <sso-session-store>
+
+ <class>org.josso.gateway.session.service.store.db.DataSourceSessionStore</class>
+
+ <dsJndiName>java:jdbc/JossoSamplesDB</dsJndiName>
+
+ <sizeQuery>SELECT COUNT(*) FROM JOSSO_SESSION</sizeQuery>
+ <keysQuery>SELECT session_id FROM JOSSO_SESSION</keysQuery>
+ <loadAllQuery>SELECT session_id, userName, creation_time, last_access_time, access_count, max_inactive_interval, valid FROM JOSSO_SESSION</loadAllQuery>
+ <loadQuery>SELECT session_id, userName, creation_time, last_access_time, access_count, max_inactive_interval, valid FROM JOSSO_SESSION WHERE session_id = ?</loadQuery>
+ <loadByUserNameQuery>SELECT session_id, userName, creation_time, last_access_time, access_count, max_inactive_interval, valid FROM JOSSO_SESSION WHERE username = ?</loadByUserNameQuery>
+
+ <loadByLastAccessTimeQuery>SELECT session_id, userName, creation_time, last_access_time, access_count, max_inactive_interval, valid FROM JOSSO_SESSION WHERE last_access_time < ?</loadByLastAccessTimeQuery>
+ <loadByValidQuery>SELECT session_id, userName, creation_time, last_access_time, access_count, max_inactive_interval, valid FROM JOSSO_SESSION WHERE valid = ?</loadByValidQuery>
+ <deleteDml>DELETE FROM JOSSO_SESSION WHERE session_id = ?</deleteDml>
+ <deleteAllDml>DELETE FROM JOSSO_SESSION</deleteAllDml>
+ <insertDml>INSERT INTO JOSSO_SESSION (session_id, userName, creation_time, last_access_time, access_count, max_inactive_interval, valid) VALUES (?, ?, ?, ?, ?, ?, ?) </insertDml>
+
+ <dsJndiName>java:jdbc/JossoSamplesDB</dsJndiName>
+
+ </sso-session-store>
+ -->
+
+ <!-- =============================================================== -->
+ <!-- Jdbc Session Store -->
+ <!-- -->
+ <!-- This store persists SSO sessions in a RDBMS, it's usefull for -->
+ <!-- example when multiple SSO servers must share session information-->
+ <!-- like in a cluster. -->
+ <!-- -->
+ <!-- NOTE :Remember to escape spetial chars like < with < , etc -->
+ <!-- -->
+ <!-- Chcek javadoc for configuration details : -->
+ <!-- org.josso.gateway.session.service.store.db.JdbcSessionStore -->
+ <!-- =============================================================== -->
+ <!--
+ <sso-session-store>
+
+ <class>org.josso.gateway.session.service.store.db.JdbcSessionStore</class>
+
+ <connectionName>josso</connectionName>
+ <connectionPassword>josso</connectionPassword>
+ <connectionURL>jdbc:oracle:thin:@localhost:1521:josso_db</connectionURL>
+ <driverName>oracle.jdbc.driver.OracleDriver</driverName>
+
+ <sizeQuery>SELECT COUNT(*) FROM JOSSO_SESSION</sizeQuery>
+ <keysQuery>SELECT session_id FROM JOSSO_SESSION</keysQuery>
+ <loadAllQuery>SELECT session_id, userName, creation_time, last_access_time, access_count, max_inactive_interval, valid FROM JOSSO_SESSION</loadAllQuery>
+ <loadQuery>SELECT session_id, userName, creation_time, last_access_time, access_count, max_inactive_interval, valid FROM JOSSO_SESSION WHERE session_id = ?</loadQuery>
+ <loadByUserNameQuery>SELECT session_id, userName, creation_time, last_access_time, access_count, max_inactive_interval, valid FROM JOSSO_SESSION WHERE username = ?</loadByUserNameQuery>
+
+ <loadByLastAccessTimeQuery>SELECT session_id, userName, creation_time, last_access_time, access_count, max_inactive_interval, valid FROM JOSSO_SESSION WHERE last_access_time < ?</loadByLastAccessTimeQuery>
+ <loadByValidQuery>SELECT session_id, userName, creation_time, last_access_time, access_count, max_inactive_interval, valid FROM JOSSO_SESSION WHERE valid = ?</loadByValidQuery>
+ <deleteDml>DELETE FROM JOSSO_SESSION WHERE session_id = ?</deleteDml>
+ <deleteAllDml>DELETE FROM JOSSO_SESSION</deleteAllDml>
+ <insertDml>INSERT INTO JOSSO_SESSION (session_id, userName, creation_time, last_access_time, access_count, max_inactive_interval, valid) VALUES (?, ?, ?, ?, ?, ?, ?) </insertDml>
+
+ </sso-session-store>
+ -->
+
+
+ <!-- =============================================================== -->
+ <!-- Memory Session Store -->
+ <!-- =============================================================== -->
+ <sso-session-store>
+ <class>org.josso.gateway.session.service.store.MemorySessionStore</class>
+ </sso-session-store>
+
+ <sso-session-id-generator>
+
+ <class>org.josso.gateway.session.service.SessionIdGeneratorImpl</class>
+ <!--
+ The message digest algorithm to be used when generating session
+ identifiers. This must be an algorithm supported by the
+ java.security.MessageDigest class on your platform.
+
+ In J2SE 1.4.2 you can check :
+ Java Cryptography Architecture API Specification & Reference - Apendix A : Standard Names
+ Values are : MD2, MD5, SHA-1, SHA-256, SHA-384, SHA-512
+ -->
+ <algorithm>MD5</algorithm>
+
+ </sso-session-id-generator>
+
+ </sso-session-manager>
+
+ <!-- SSO Audit Manager compoment -->
+ <sso-audit-manager>
+ <class>org.josso.gateway.audit.service.SSOAuditManagerImpl</class>
+
+ <!--
+ List of handlers that will process this request
+ Every handler must have its own unique name.
+ -->
+ <handlers>
+
+ <!-- This handler logs all audit trails using Log4J, under the given category -->
+ <handler>
+ <class>org.josso.gateway.audit.service.handler.LoggerAuditTrailHandler</class>
+ <name>LoggerAuditTrailHandler</name>
+ <category>org.josso.gateway.audit.SSO_AUDIT</category>
+ </handler>
+
+ <!--
+ <handler>
+ <class>MyOtherHandler</class>
+ <name>MyOhterHandlerName</name>
+ <myProperty>value</myProperty>
+ </handler>
+ -->
+
+ </handlers>
+ </sso-audit-manager>
+
+ <!-- SSO Event Manager component -->
+ <sso-event-manager>
+ <class>org.josso.gateway.event.security.JMXSSOEventManagerImpl</class>
+ <!--
+ JMX Name of the EventManager MBean that will send SSO Events as JMX Notifications
+ The MBean will be registered by the MBeanComponentKeeper.
+ -->
+ <oname>josso:type=SSOEventManager</oname>
+ <!-- You can add your own listeners here : -->
+ <!-- Every listener should have a unique name -->
+
+ <!--
+ <listeners>
+ <listener>
+ <class>com.myCompany.MyEventListener</class>
+ <name>MyEventListener</name>
+ <property1>MyListenerProperty1Value</property1>
+ </listener>
+ <listener>
+ <class>com.myCompany.MyOtherEventListener</class>
+ <name>MyOtherEventListener</name>
+ <propertyA>MyOtherListenerPropertyAValue</propertyA>
+ </listener>
+ </listeners>
+ -->
+
+ </sso-event-manager>
+
+</domain>
Added: branches/2_6_CAS_Integration/identity/josso/config/josso-jboss4-plugin-1.5.jar
===================================================================
(Binary files differ)
Property changes on: branches/2_6_CAS_Integration/identity/josso/config/josso-jboss4-plugin-1.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/2_6_CAS_Integration/identity/josso/config/josso-tomcat55-plugin-1.5.jar
===================================================================
(Binary files differ)
Property changes on: branches/2_6_CAS_Integration/identity/josso/config/josso-tomcat55-plugin-1.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/2_6_CAS_Integration/identity/josso/config/login-config.xml
===================================================================
--- branches/2_6_CAS_Integration/identity/josso/config/login-config.xml (rev 0)
+++ branches/2_6_CAS_Integration/identity/josso/config/login-config.xml 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,165 @@
+<?xml version='1.0'?>
+<!DOCTYPE policy PUBLIC
+ "-//JBoss//DTD JBOSS Security Config 3.0//EN"
+ "http://www.jboss.org/j2ee/dtd/security_config.dtd">
+
+<!-- The XML based JAAS login configuration read by the
+org.jboss.security.auth.login.XMLLoginConfig mbean. Add
+an application-policy element for each security domain.
+
+The outline of the application-policy is:
+<application-policy name="security-domain-name">
+ <authentication>
+ <login-module code="login.module1.class.name" flag="control_flag">
+ <module-option name = "option1-name">option1-value</module-option>
+ <module-option name = "option2-name">option2-value</module-option>
+ ...
+ </login-module>
+
+ <login-module code="login.module2.class.name" flag="control_flag">
+ ...
+ </login-module>
+ ...
+ </authentication>
+</application-policy>
+
+-->
+
+<policy>
+ <!-- Used by clients within the application server VM such as
+ mbeans and servlets that access EJBs.
+ -->
+ <application-policy name = "client-login">
+ <authentication>
+ <login-module code = "org.jboss.security.ClientLoginModule"
+ flag = "required">
+ <!-- Any existing security context will be restored on logout -->
+ <module-option name="restore-login-identity">true</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- Security domain for JBossMQ -->
+ <application-policy name = "jbossmq">
+ <authentication>
+ <login-module code = "org.jboss.security.auth.spi.DatabaseServerLoginModule"
+ flag = "required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name = "dsJndiName">java:/DefaultDS</module-option>
+ <module-option name = "principalsQuery">SELECT PASSWD FROM JMS_USERS WHERE USERID=?</module-option>
+ <module-option name = "rolesQuery">SELECT ROLEID, 'Roles' FROM JMS_ROLES WHERE USERID=?</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- Security domain for JBossMQ when using file-state-service.xml
+ <application-policy name = "jbossmq">
+ <authentication>
+ <login-module code = "org.jboss.mq.sm.file.DynamicLoginModule"
+ flag = "required">
+ <module-option name = "unauthenticatedIdentity">guest</module-option>
+ <module-option name = "sm.objectname">jboss.mq:service=StateManager</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+ -->
+
+ <!-- Security domains for testing new jca framework -->
+ <application-policy name = "HsqlDbRealm">
+ <authentication>
+ <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag = "required">
+ <module-option name = "principal">sa</module-option>
+ <module-option name = "userName">sa</module-option>
+ <module-option name = "password"></module-option>
+ <module-option name = "managedConnectionFactoryName">jboss.jca:service=LocalTxCM,name=DefaultDS</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <application-policy name = "JmsXARealm">
+ <authentication>
+ <login-module code = "org.jboss.resource.security.ConfiguredIdentityLoginModule"
+ flag = "required">
+ <module-option name = "principal">guest</module-option>
+ <module-option name = "userName">guest</module-option>
+ <module-option name = "password">guest</module-option>
+ <module-option name = "managedConnectionFactoryName">jboss.jca:service=TxCM,name=JmsXA</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the jmx-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name = "jmx-console">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required">
+ <module-option name="usersProperties">props/jmx-console-users.properties</module-option>
+ <module-option name="rolesProperties">props/jmx-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the web-console web application. This
+ defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name = "$webConsoleDomain">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required">
+ <module-option name="usersProperties">web-console-users.properties</module-option>
+ <module-option name="rolesProperties">web-console-roles.properties</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- A template configuration for the JBossWS web application (and transport layer!).
+ This defaults to the UsersRolesLoginModule the same as other and should be
+ changed to a stronger authentication mechanism as required.
+ -->
+ <application-policy name="JBossWS">
+ <authentication>
+ <login-module code="org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag="required">
+ <module-option name="usersProperties">props/jbossws-users.properties</module-option>
+ <module-option name="rolesProperties">props/jbossws-roles.properties</module-option>
+ <module-option name="unauthenticatedIdentity">anonymous</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+ <!-- The default login configuration used by any security domain that
+ does not have a application-policy entry with a matching name
+ -->
+ <application-policy name = "other">
+ <!-- A simple server login module, which can be used when the number
+ of users is relatively small. It uses two properties files:
+ users.properties, which holds users (key) and their password (value).
+ roles.properties, which holds users (key) and a comma-separated list of
+ their roles (value).
+ The unauthenticatedIdentity property defines the name of the principal
+ that will be used when a null username and password are presented as is
+ the case for an unuathenticated web client or MDB. If you want to
+ allow such users to be authenticated add the property, e.g.,
+ unauthenticatedIdentity="nobody"
+ -->
+ <authentication>
+ <login-module code = "org.jboss.security.auth.spi.UsersRolesLoginModule"
+ flag = "required" />
+ </authentication>
+ </application-policy>
+
+ <!-- JOSSO JAAS Module configuration -->
+ <application-policy name = "josso">
+ <authentication>
+ <login-module code = "org.jboss.portal.identity.auth.JOSSOLoginModule"
+ flag = "required">
+ <module-option name="debug">true</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+</policy>
Added: branches/2_6_CAS_Integration/identity/josso/config/login.jsp
===================================================================
--- branches/2_6_CAS_Integration/identity/josso/config/login.jsp (rev 0)
+++ branches/2_6_CAS_Integration/identity/josso/config/login.jsp 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,41 @@
+<%--
+ ~ Copyright (c) 2004-2006, Novascope S.A. and the JOSSO team
+ ~ All rights reserved.
+ ~ Redistribution and use in source and binary forms, with or
+ ~ without modification, are permitted provided that the following
+ ~ conditions are met:
+ ~
+ ~ * Redistributions of source code must retain the above copyright
+ ~ notice, this list of conditions and the following disclaimer.
+ ~
+ ~ * Redistributions in binary form must reproduce the above copyright
+ ~ notice, this list of conditions and the following disclaimer in
+ ~ the documentation and/or other materials provided with the
+ ~ distribution.
+ ~
+ ~ * Neither the name of the JOSSO team nor the names of its
+ ~ contributors may be used to endorse or promote products derived
+ ~ from this software without specific prior written permission.
+ ~
+ ~ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ ~ CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ ~ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ ~ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ ~ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ ~ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ ~ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ ~ TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ ~ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ~ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ ~ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ ~ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ ~ POSSIBILITY OF SUCH DAMAGE.
+ --%>
+
+<%@page contentType="text/html; charset=iso-8859-1" language="java" session="true" %>
+<!--
+Redirects the user to the propper login page. Configured as the login url the web.xml for this application.
+-->
+<%
+ response.sendRedirect(request.getContextPath() + "/josso_login/");
+%>
Added: branches/2_6_CAS_Integration/identity/josso/config/server.xml
===================================================================
--- branches/2_6_CAS_Integration/identity/josso/config/server.xml (rev 0)
+++ branches/2_6_CAS_Integration/identity/josso/config/server.xml 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,178 @@
+<Server>
+
+ <!-- Use a custom version of StandardService that allows the
+ connectors to be started independent of the normal lifecycle
+ start to allow web apps to be deployed before starting the
+ connectors.
+ -->
+ <Service name="jboss.web"
+ className="org.jboss.web.tomcat.tc5.StandardService">
+
+ <!-- A HTTP/1.1 Connector on port 8080 -->
+ <Connector port="8080" address="${jboss.bind.address}"
+ maxThreads="250" strategy="ms" maxHttpHeaderSize="8192"
+ emptySessionPath="true"
+ enableLookups="false" redirectPort="8443" acceptCount="100"
+ connectionTimeout="20000" disableUploadTimeout="true"/>
+
+ <!-- Add this option to the connector to avoid problems with
+ .NET clients that don't implement HTTP/1.1 correctly
+ restrictedUserAgents="^.*MS Web Services Client Protocol 1.1.4322.*$"
+ -->
+
+ <!-- A AJP 1.3 Connector on port 8009 -->
+ <Connector port="8009" address="${jboss.bind.address}"
+ emptySessionPath="true" enableLookups="false" redirectPort="8443"
+ protocol="AJP/1.3"/>
+
+ <!-- SSL/TLS Connector configuration using the admin devl guide keystore
+ <Connector port="8443" address="${jboss.bind.address}"
+ maxThreads="100" strategy="ms" maxHttpHeaderSize="8192"
+ emptySessionPath="true"
+ scheme="https" secure="true" clientAuth="false"
+ keystoreFile="${jboss.server.home.dir}/conf/chap8.keystore"
+ keystorePass="rmi+ssl" sslProtocol = "TLS" />
+ -->
+
+ <Engine name="jboss.web" defaultHost="localhost">
+
+ <!-- The JAAS based authentication and authorization realm implementation
+ that is compatible with the jboss 3.2.x realm implementation.
+ - certificatePrincipal : the class name of the
+ org.jboss.security.auth.certs.CertificatePrincipal impl
+ used for mapping X509[] cert chains to a Princpal.
+ - allRolesMode : how to handle an auth-constraint with a role-name=*,
+ one of strict, authOnly, strictAuthOnly
+ + strict = Use the strict servlet spec interpretation which requires
+ that the user have one of the web-app/security-role/role-name
+ + authOnly = Allow any authenticated user
+ + strictAuthOnly = Allow any authenticated user only if there are no
+ web-app/security-roles
+ -->
+ <!--
+ <Realm className="org.jboss.web.tomcat.security.JBossSecurityMgrRealm"
+ certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+ allRolesMode="authOnly"
+ />
+ -->
+
+ <!-- A subclass of JBossSecurityMgrRealm that uses the authentication
+ behavior of JBossSecurityMgrRealm, but overrides the authorization
+ checks to use JACC permissions with the current java.security.Policy
+ to determine authorized access.
+ - allRolesMode : how to handle an auth-constraint with a role-name=*,
+ one of strict, authOnly, strictAuthOnly
+ + strict = Use the strict servlet spec interpretation which requires
+ that the user have one of the web-app/security-role/role-name
+ + authOnly = Allow any authenticated user
+ + strictAuthOnly = Allow any authenticated user only if there are no
+ web-app/security-roles
+ <Realm className="org.jboss.web.tomcat.security.JaccAuthorizationRealm"
+ certificatePrincipal="org.jboss.security.auth.certs.SubjectDNMapping"
+ allRolesMode="authOnly"
+ />
+ -->
+
+ <!-- Integrating the JOSSO realm -->
+ <Realm className="org.josso.jb4.agent.JBossCatalinaRealm"
+ appName="josso"
+ userClassNames="org.josso.gateway.identity.service.BaseUserImpl"
+ roleClassNames="org.josso.gateway.identity.service.BaseRoleImpl"
+ debug="1" />
+
+ <Host name="localhost"
+ autoDeploy="false" deployOnStartup="false" deployXML="false">
+
+ <!-- UNCOMMENT TO ENABLE CUSTOMIZATION OF TOMCAT AUTHENTICATORS
+ <Host name="localhost"
+ autoDeploy="false" deployOnStartup="false" deployXML="false"
+ configClass="org.jboss.web.tomcat.security.config.JBossContextConfig">
+ -->
+
+
+ <!-- Uncomment to enable request dumper. This Valve "logs interesting
+ contents from the specified Request (before processing) and the
+ corresponding Response (after processing). It is especially useful
+ in debugging problems related to headers and cookies."
+ -->
+ <!--
+ <Valve className="org.apache.catalina.valves.RequestDumperValve" />
+ -->
+
+ <!-- Access logger -->
+ <!--
+ <Valve className="org.apache.catalina.valves.FastCommonAccessLogValve"
+ prefix="localhost_access_log." suffix=".log"
+ pattern="common" directory="${jboss.server.home.dir}/log"
+ resolveHosts="false" />
+ -->
+
+ <!-- Uncomment to enable single sign-on across web apps
+ deployed to this host. Does not provide SSO across a cluster.
+
+ If this valve is used, do not use the JBoss ClusteredSingleSignOn
+ valve shown below.
+
+ A new configuration attribute is available beginning with
+ release 4.0.4:
+
+ cookieDomain configures the domain to which the SSO cookie
+ will be scoped (i.e. the set of hosts to
+ which the cookie will be presented). By default
+ the cookie is scoped to "/", meaning the host
+ that presented it. Set cookieDomain to a
+ wider domain (e.g. "xyz.com") to allow an SSO
+ to span more than one hostname.
+ -->
+ <!--
+ <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
+ -->
+
+ <!-- Uncomment to enable single sign-on across web apps
+ deployed to this host AND to all other hosts in the cluster.
+
+ If this valve is used, do not use the standard Tomcat SingleSignOn
+ valve shown above.
+
+ Valve uses a JBossCache instance to support SSO credential
+ caching and replication across the cluster. The JBossCache
+ instance must be configured separately. By default, the valve
+ shares a JBossCache with the service that supports HttpSession
+ replication. See the "tc5-cluster-service.xml" file in the
+ server/all/deploy directory for cache configuration details.
+
+ Besides the attributes supported by the standard Tomcat
+ SingleSignOn valve (see the Tomcat docs), this version also
+ supports the following attributes:
+
+ cookieDomain see above
+
+ treeCacheName JMX ObjectName of the JBossCache MBean used to
+ support credential caching and replication across
+ the cluster. If not set, the default value is
+ "jboss.cache:service=TomcatClusteringCache", the
+ standard ObjectName of the JBossCache MBean used
+ to support session replication.
+ -->
+ <!--
+ <Valve className="org.jboss.web.tomcat.tc5.sso.ClusteredSingleSignOn" />
+ -->
+
+
+ <!-- Uncomment to check for unclosed connections and transaction terminated checks
+ in servlets/jsps.
+ Important: You need to uncomment the dependency on the CachedConnectionManager
+ in META-INF/jboss-service.xml
+ <Valve className="org.jboss.web.tomcat.tc5.jca.CachedConnectionValve"
+ cachedConnectionManagerObjectName="jboss.jca:service=CachedConnectionManager"
+ transactionManagerObjectName="jboss:service=TransactionManager" />
+ -->
+
+ <!-- JOSSO Agent Valve -->
+ <Valve className="org.josso.tc55.agent.SSOAgentValve" debug="1"/>
+ </Host>
+ </Engine>
+
+ </Service>
+
+</Server>
Added: branches/2_6_CAS_Integration/identity/josso/lib/josso-1.5.jar
===================================================================
(Binary files differ)
Property changes on: branches/2_6_CAS_Integration/identity/josso/lib/josso-1.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/2_6_CAS_Integration/identity/josso/lib/josso-jboss4-plugin-1.5.jar
===================================================================
(Binary files differ)
Property changes on: branches/2_6_CAS_Integration/identity/josso/lib/josso-jboss4-plugin-1.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/2_6_CAS_Integration/identity/josso/lib/josso-tomcat55-plugin-1.5.jar
===================================================================
(Binary files differ)
Property changes on: branches/2_6_CAS_Integration/identity/josso/lib/josso-tomcat55-plugin-1.5.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/CASAuthenticationService.java
===================================================================
--- branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/CASAuthenticationService.java 2007-08-22 17:39:30 UTC (rev 8037)
+++ branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/CASAuthenticationService.java 2007-08-22 19:57:38 UTC (rev 8038)
@@ -109,14 +109,16 @@
*/
public boolean authenticate(String username, String password)
{
+ Session session = null;
+ Transaction tx = null;
try
{
boolean status = false;
InitialContext initialContext = new InitialContext();
SessionFactory sessionFactory = (SessionFactory)initialContext.lookup("java:/portal/IdentitySessionFactory");
- Session session = sessionFactory.openSession();
- Transaction tx = session.beginTransaction();
+ session = sessionFactory.openSession();
+ tx = session.beginTransaction();
User user = this.userModule.findUserByUserName(username);
if(user != null)
@@ -149,10 +151,7 @@
status = user.validatePassword(password);
}
}
-
- tx.commit();
- session.close();
-
+
return status;
}
catch(Exception e)
@@ -160,5 +159,10 @@
log.error(this, e);
return false;
}
+ finally
+ {
+ tx.commit();
+ session.close();
+ }
}
}
Added: branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOIdentityService.java
===================================================================
--- branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOIdentityService.java (rev 0)
+++ branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOIdentityService.java 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,45 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.identity.auth;
+
+/*
+ * Created on May 24, 2007
+ *
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public interface JOSSOIdentityService extends AuthenticationService
+{
+ /**
+ *
+ * @param username
+ * @return
+ */
+ public String[] getUserRoles(String username);
+
+ /**
+ *
+ * @param username
+ * @return
+ */
+ public boolean exists(String username);
+}
Added: branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOIdentityServiceImpl.java
===================================================================
--- branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOIdentityServiceImpl.java (rev 0)
+++ branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOIdentityServiceImpl.java 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,212 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.identity.auth;
+
+import java.util.Iterator;
+import java.util.Set;
+
+import javax.naming.InitialContext;
+
+import org.apache.log4j.Logger;
+
+import org.hibernate.SessionFactory;
+import org.hibernate.Session;
+import org.hibernate.Transaction;
+
+import org.jboss.portal.identity.Role;
+import org.jboss.portal.identity.UserModule;
+import org.jboss.portal.identity.UserProfileModule;
+import org.jboss.portal.identity.MembershipModule;
+import org.jboss.portal.identity.User;
+
+/*
+ * Created on May 24, 2007
+ *
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class JOSSOIdentityServiceImpl implements JOSSOIdentityService
+{
+ private static Logger log = Logger.getLogger(JOSSOIdentityServiceImpl.class);
+
+ private UserModule userModule = null;
+ private UserProfileModule profileModule = null;
+ private MembershipModule membershipModule = null;
+
+ /**
+ *
+ *
+ */
+ public void start()
+ {
+ try
+ {
+ InitialContext initialContext = new InitialContext();
+
+ this.userModule = (UserModule)initialContext.lookup("java:/portal/UserModule");
+ this.profileModule = (UserProfileModule)initialContext.lookup("java:/portal/UserProfileModule");
+ this.membershipModule = (MembershipModule)initialContext.lookup("java:/portal/MembershipModule");
+ }
+ catch(Exception e)
+ {
+ log.error(this, e);
+ this.stop();
+ }
+ }
+
+ /**
+ *
+ *
+ */
+ public void stop()
+ {
+ this.userModule = null;
+ this.profileModule = null;
+ this.membershipModule = null;
+ }
+
+ /**
+ *
+ * @param username
+ * @return
+ */
+ public String[] getUserRoles(String username)
+ {
+ Session session = null;
+ Transaction tx = null;
+ try
+ {
+ String[] userRoles = null;
+
+ InitialContext initialContext = new InitialContext();
+ SessionFactory sessionFactory = (SessionFactory)initialContext.lookup("java:/portal/IdentitySessionFactory");
+ session = sessionFactory.openSession();
+ tx = session.beginTransaction();
+
+ User user = this.userModule.findUserByUserName(username);
+ if(user != null && user.getUserName().trim().equals(username.trim()))
+ {
+ Set roles = this.membershipModule.getRoles(user);
+ userRoles = new String[roles.size()+1];
+ userRoles[0] = "Authenticated";
+ int index = 1;
+ for(Iterator itr=roles.iterator();itr.hasNext();)
+ {
+ Role role = (Role)itr.next();
+ userRoles[index++] = role.getName();
+ }
+ }
+
+ return userRoles;
+ }
+ catch(Exception e)
+ {
+ log.error(this, e);
+ throw new RuntimeException(e);
+ }
+ finally
+ {
+ tx.commit();
+ session.close();
+ }
+ }
+
+ /**
+ *
+ * @param username
+ * @return
+ */
+ public boolean exists(String username)
+ {
+ Session session = null;
+ Transaction tx = null;
+ try
+ {
+ boolean exists = false;
+
+ InitialContext initialContext = new InitialContext();
+ SessionFactory sessionFactory = (SessionFactory)initialContext.lookup("java:/portal/IdentitySessionFactory");
+ session = sessionFactory.openSession();
+ tx = session.beginTransaction();
+
+ User user = this.userModule.findUserByUserName(username);
+ if(user != null && user.getUserName().trim().equals(username.trim()))
+ {
+ exists = true;
+ }
+
+ return exists;
+ }
+ catch(Exception e)
+ {
+ log.error(this, e);
+ throw new RuntimeException(e);
+ }
+ finally
+ {
+ tx.commit();
+ session.close();
+ }
+ }
+
+ /**
+ *
+ */
+ public boolean authenticate(String username, String password)
+ {
+ Session session = null;
+ Transaction tx = null;
+ try
+ {
+ boolean status = false;
+
+ InitialContext initialContext = new InitialContext();
+ SessionFactory sessionFactory = (SessionFactory)initialContext.lookup("java:/portal/IdentitySessionFactory");
+ session = sessionFactory.openSession();
+ tx = session.beginTransaction();
+
+ User user = this.userModule.findUserByUserName(username);
+ if(user != null)
+ {
+ //Check and make sure the user account is enabled
+ Boolean enabled = (Boolean)this.profileModule.getProperty(user, User.INFO_USER_ENABLED);
+ if(enabled != null || enabled.booleanValue())
+ {
+ //Now perform validation
+ status = user.validatePassword(password);
+ }
+ }
+
+ return status;
+ }
+ catch(Exception e)
+ {
+ log.error(this, e);
+ return false;
+ }
+ finally
+ {
+ tx.commit();
+ session.close();
+ }
+ }
+}
Added: branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOIdentityStore.java
===================================================================
--- branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOIdentityStore.java (rev 0)
+++ branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOIdentityStore.java 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,190 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.identity.auth;
+
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+
+import org.apache.log4j.Logger;
+
+import org.jboss.mx.util.MBeanProxy;
+import org.jboss.mx.util.MBeanServerLocator;
+import org.josso.gateway.SSONameValuePair;
+import org.josso.gateway.identity.exceptions.NoSuchUserException;
+import org.josso.gateway.identity.exceptions.SSOIdentityException;
+import org.josso.gateway.identity.service.BaseRole;
+import org.josso.gateway.identity.service.BaseRoleImpl;
+import org.josso.gateway.identity.service.BaseUser;
+import org.josso.gateway.identity.service.BaseUserImpl;
+import org.josso.gateway.identity.service.store.IdentityStore;
+import org.josso.gateway.identity.service.store.UserKey;
+import org.josso.gateway.identity.service.store.SimpleUserKey;
+import org.josso.auth.Credential;
+import org.josso.auth.CredentialKey;
+import org.josso.auth.BindableCredentialStore;
+import org.josso.auth.exceptions.SSOAuthenticationException;
+import org.josso.auth.scheme.AuthenticationScheme;
+import org.josso.auth.scheme.UsernameCredential;
+import org.josso.auth.scheme.PasswordCredential;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ *
+ */
+public class JOSSOIdentityStore implements IdentityStore, BindableCredentialStore
+{
+ /**
+ *
+ */
+ private static Logger log = Logger.getLogger(JOSSOIdentityStore.class);
+
+ /**
+ *
+ */
+ private AuthenticationScheme authenticationScheme = null;
+
+ /**
+ *
+ */
+ private JOSSOIdentityService portalIdentityService = null;
+
+
+ /**
+ *
+ *
+ */
+ public JOSSOIdentityStore()
+ {
+ try
+ {
+ MBeanServer mbeanServer = MBeanServerLocator.locateJBoss();
+ this.portalIdentityService = (JOSSOIdentityService)
+ MBeanProxy.get(JOSSOIdentityService.class,new ObjectName("portal:service=Module,type=JOSSOIdentityService"),mbeanServer);
+ }
+ catch(Exception e)
+ {
+ this.authenticationScheme = null;
+ this.portalIdentityService = null;
+
+ log.error(this, e);
+ throw new RuntimeException("JOSSOIdentityStore registration failed....");
+ }
+ }
+ //-----IdentityStore implementation--------------------------------------------------------------------------------------------------
+ /**
+ *
+ */
+ public BaseRole[] findRolesByUserKey(UserKey userKey)
+ throws SSOIdentityException
+ {
+ if(this.portalIdentityService == null)
+ {
+ throw new IllegalStateException("JOSSOIdentityStore not properly registered with the JOSSO system..");
+ }
+
+ //Get the role information from the Portal Identity System
+ String[] userRoles = this.portalIdentityService.getUserRoles(userKey.toString());
+
+ //Map the Portal Identity information to JOSSO Identity information
+ BaseRole[] roles = new BaseRole[userRoles.length];
+ for(int i=0; i<userRoles.length; i++)
+ {
+ roles[i] = new BaseRoleImpl(userRoles[i]);
+ }
+
+
+ return roles;
+ }
+
+ /**
+ *
+ */
+ public BaseUser loadUser(UserKey userKey) throws NoSuchUserException,
+ SSOIdentityException
+ {
+ if(this.portalIdentityService == null)
+ {
+ throw new IllegalStateException("JOSSOIdentityStore not properly registered with the JOSSO system..");
+ }
+
+ //Map the Portal Identity to JOSSO Identity
+ BaseUser user = new BaseUserImpl();
+ user.setName(userKey.toString());
+ user.addProperty("password", "");
+
+ return user;
+ }
+
+ /**
+ *
+ */
+ public boolean userExists(UserKey userKey) throws SSOIdentityException
+ {
+ if(this.portalIdentityService == null)
+ {
+ throw new IllegalStateException("JOSSOIdentityStore not properly registered with the JOSSO system..");
+ }
+
+ return this.portalIdentityService.exists(userKey.toString());
+ }
+ //---------BindableCredentialStore implementation---------------------------------------------------------------------------------------------
+ /**
+ *
+ */
+ public Credential[] loadCredentials(CredentialKey credentialKey) throws SSOIdentityException
+ {
+ if(this.portalIdentityService == null)
+ {
+ throw new IllegalStateException("JOSSOIdentityStore not properly registered with the JOSSO system..");
+ }
+
+ //Get the User corresponding to this credentialKey
+ BaseUser user = this.loadUser((SimpleUserKey)credentialKey);
+ SSONameValuePair[] properties = user.getProperties();
+ String password = properties[0].getValue();
+
+ return new Credential[]{new UsernameCredential(user.getName()), new PasswordCredential(password)};
+ }
+
+ /**
+ *
+ */
+ public boolean bind(String username, String password) throws SSOAuthenticationException
+ {
+ return this.portalIdentityService.authenticate(username, password);
+ }
+
+
+ /**
+ *
+ */
+ public void setAuthenticationScheme(AuthenticationScheme authenticationScheme)
+ {
+ if(this.portalIdentityService == null)
+ {
+ throw new IllegalStateException("JOSSOIdentityStore not properly registered with the JOSSO system..");
+ }
+
+ this.authenticationScheme = authenticationScheme;
+ }
+}
Added: branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOLoginModule.java
===================================================================
--- branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOLoginModule.java (rev 0)
+++ branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOLoginModule.java 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,213 @@
+/*
+ * Copyright (c) 2004-2006, Novascope S.A. and the JOSSO team
+ * All rights reserved.
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * * Neither the name of the JOSSO team nor the names of its
+ * contributors may be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+ * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jboss.portal.identity.auth;
+
+import org.apache.log4j.Logger;
+import org.josso.gateway.identity.SSORole;
+import org.josso.gateway.identity.SSOUser;
+import org.josso.gateway.identity.service.BaseRoleImpl;
+import org.josso.gateway.identity.service.BaseUserImpl;
+import org.josso.tc55.agent.jaas.SSOGatewayLoginModule;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.login.LoginException;
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * SSOGatewayLogin Module for JBoss.
+ * <p>
+ * It specialized the SSOGatewayLoginModule by associating an additional
+ * group called ("Roles") which contains user roles.
+ * The original SSOGatewayLoginModule associates the user and its roles directly
+ * as Subject's Principals. This won't work in JBoss since it obtains user roles
+ * from a special Group that must be called "Roles".
+ * This LoginModule adds this special group, adds the roles as members of it and
+ * associates such group to the Subject as built by the SSOGatewayLoginModule.
+ * <p>
+ * To configure this JAAS Login Module module, add to the
+ * $JBOSS_HOME/server/default/conf/login-config.xml file the following entry :
+ * <p>
+<pre>
+<policy>
+ <!-- Used by JOSSO Agents for authenticating users against the Gateway -->
+ <application-policy name = "josso">
+ <authentication>
+ <login-module code = "org.josso.jb32.agent.JBossSSOGatewayLoginModule"
+ flag = "required">
+ <module-option name="debug">true</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+ ...
+ </policy>
+</pre>
+ *
+ * @author <a href="mailto:gbrigand@josso.org">Gianluca Brigandi</a>
+ * @version CVS $Id: JBossSSOGatewayLoginModule.java 338 2006-02-09 16:53:07Z sgonzalez $
+ */
+
+public class JOSSOLoginModule extends SSOGatewayLoginModule {
+
+ private static final Logger logger = Logger.getLogger(JOSSOLoginModule .class);
+
+ private Subject _savedSubject;
+
+ /** the principal to use when user is not authenticated **/
+ protected SSOUser _unauthenticatedIdentity;
+
+
+ /**
+ * Initialize this LoginModule .
+ * Save the received Subject to change it when commit() gets invoked.
+ *
+ * @param subject the Subject to be authenticated.
+ *
+ * @param callbackHandler a CallbackHandler for communicating
+ * with the end user (prompting for user names and
+ * passwords, for example).
+ *
+ * @param sharedState shared LoginModule state.
+ *
+ * @param options options specified in the login Configuration
+ * for this particular LoginModule.
+ */
+ public void initialize(Subject subject, CallbackHandler callbackHandler,
+ Map sharedState, Map options) {
+
+ _savedSubject = subject;
+ super.initialize(subject, callbackHandler, sharedState, options);
+ // Check for unauthenticatedIdentity option.
+ String name = (String) options.get("unauthenticatedIdentity");
+ if( name != null )
+ {
+ try
+ {
+ _unauthenticatedIdentity = createIdentity(name);
+ logger.debug("Saw unauthenticatedIdentity="+name);
+ }
+ catch(Exception e)
+ {
+ logger.warn("Failed to create custom unauthenticatedIdentity", e);
+ }
+ }
+ }
+
+ /**
+ * This method supports the unauthenticatedIdentity property used by JBoss.
+ */
+ public boolean login() throws LoginException {
+
+ if (!super.login()) {
+ // We have an unauthenticated user, use configured Principal
+ if (_unauthenticatedIdentity != null) {
+ logger.debug("Authenticated as unauthenticatedIdentity : " + _unauthenticatedIdentity);
+ _ssoUserPrincipal = _unauthenticatedIdentity;
+ _succeeded = true;
+ return true;
+ }
+ }
+
+ return true;
+ }
+
+ /*
+ * This method is called if the LoginContext's overall authentication succeeded.
+ *
+ * The Subject saved in the previously executed initialize() method, is modified
+ * by adding a new special Group called "Roles" whose members are the SSO user roles.
+ * JBoss will fetch user roles by examining such group.
+ *
+ * @exception LoginException if the commit fails.
+ *
+ * @return true if this LoginModule's own login and commit
+ * attempts succeeded, or false otherwise.
+ */
+ public boolean commit() throws LoginException {
+ boolean rc = false;
+ // HashMap setsMap = new HashMap();
+
+ rc = super.commit();
+
+ Set ssoRolePrincipals = _savedSubject.getPrincipals(SSORole.class);
+ Group targetGrp = new BaseRoleImpl("Roles");
+ Iterator i = ssoRolePrincipals.iterator();
+ Set cour = new java.util.HashSet();
+ while (i.hasNext()) {
+ Principal p = (Principal)i.next();
+
+ targetGrp.addMember(p); // Add user role to "Roles" group
+
+ //super hack to make the Subject work properly with the Portal Authorization Engine
+ ((BaseRoleImpl)p).addMember(this.createIdentity(p.getName()));
+ }
+ // Add the "Roles" group to the Subject so that JBoss can fetch user roles.
+ _savedSubject.getPrincipals().removeAll(ssoRolePrincipals);
+ _savedSubject.getPrincipals().add(targetGrp);
+
+ /*Set ssoUserPrincipals = _savedSubject.getPrincipals(SSOUser.class);
+ Group callerPrincipal = new BaseRoleImpl("CallerPrincipal");
+ Iterator j = ssoUserPrincipals.iterator();
+ if (j.hasNext()) {
+ Principal user = (Principal) j.next();
+ callerPrincipal.addMember(user);
+ }
+
+ // Add the "CallerPrincipal" group to the Subject so that JBoss can fetch user.
+ _savedSubject.getPrincipals().add(callerPrincipal);*/
+
+ return rc;
+ }
+
+ protected SSOUser createIdentity(String username) {
+ return new BaseUserImpl(username);
+ }
+
+ protected SSORole[] getRoleSets() throws LoginException {
+ if (_ssoUserPrincipal == _unauthenticatedIdentity) {
+ // Using unauthenticatedIdentity ..
+ if(logger.isDebugEnabled())
+ logger.debug("Using unauthenticatedIdentity " + _ssoUserPrincipal + ", returning no roles.");
+
+ return new SSORole[0];
+ }
+ return super.getRoleSets();
+ }
+
+}
Added: branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOLogoutValve.java
===================================================================
--- branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOLogoutValve.java (rev 0)
+++ branches/2_6_CAS_Integration/identity/src/main/org/jboss/portal/identity/auth/JOSSOLogoutValve.java 2007-08-22 19:57:38 UTC (rev 8038)
@@ -0,0 +1,122 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.identity.auth;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.Cookie;
+
+import org.apache.catalina.connector.Request;
+import org.apache.catalina.connector.Response;
+import org.apache.catalina.valves.ValveBase;
+
+/*
+ * Created on May 23, 2007
+ *
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class JOSSOLogoutValve extends ValveBase
+{
+ /**
+ *
+ */
+ public void invoke(Request request, Response response) throws IOException,
+ ServletException
+ {
+ HttpServletRequest httpRequest = (HttpServletRequest) request;
+
+ Cookie jossoPortalCookie = this.findJOSSOPortalLogoutCookie(httpRequest);
+ if(jossoPortalCookie != null)
+ {
+ String referer = jossoPortalCookie.getValue();
+
+ if(referer != null && referer.trim().length() > 0)
+ {
+ //Delete this cookie
+ jossoPortalCookie = new Cookie("JOSSO_PORTAL_LOGOUT", "");
+ jossoPortalCookie.setMaxAge(0); //setting the value to 0 should delete this cookie from the browser
+ response.addCookie(jossoPortalCookie);
+
+ //This form of redirect is needed instead of sendRedirect
+ //otherwise the JBOSS_PORTAL_LOGOUT cookie cleanup does not happen
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("<html>"+"\n");
+ buffer.append("<head>"+"\n");
+ buffer.append("</head>"+"\n");
+ buffer.append("<body onload=\"setTimeout('document.form1.submit()',1000);\">"+"\n");
+ buffer.append("<form name=\"form1\" action=\""+referer+"\" method=\"post\">"+"\n");
+ buffer.append("</form>"+"\n");
+ buffer.append("</body>"+"\n");
+ buffer.append("</html>"+"\n");
+
+ response.getOutputStream().write(buffer.toString().getBytes());
+ response.getOutputStream().flush();
+
+ return;
+ }
+ }
+
+ // continue processing the request
+ this.getNext().invoke(request, response);
+
+ if(httpRequest.getRequestURI().endsWith("/signout"))
+ {
+ String jossoLogout = httpRequest.getContextPath() + org.josso.agent.Constants.JOSSO_LOGOUT_URI;
+
+ Cookie cookie = new Cookie("JOSSO_PORTAL_LOGOUT",httpRequest.getHeader("Referer"));
+ cookie.setMaxAge(-1); //setting the value so that cookie expires when broser is closed
+ response.addCookie(cookie);
+
+ response.sendRedirect(jossoLogout);
+ }
+ }
+
+ /**
+ *
+ * @param request
+ * @return
+ */
+ private Cookie findJOSSOPortalLogoutCookie(HttpServletRequest request)
+ {
+ Cookie cookie = null;
+
+ Cookie[] cookies = request.getCookies();
+ if(cookies != null)
+ {
+ for(int i=0; i<cookies.length; i++)
+ {
+ Cookie cour = cookies[i];
+
+ if(cour.getName().equals("JOSSO_PORTAL_LOGOUT"))
+ {
+ cookie = cour;
+ break;
+ }
+ }
+ }
+
+ return cookie;
+ }
+}
Property changes on: branches/2_6_CAS_Integration/thirdparty
___________________________________________________________________
Name: svn:ignore
+ antlr
apache-ant
apache-codec
apache-collections
apache-fileupload
apache-httpclient
apache-lang
*
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8037 - in modules/portlet/trunk: portlet/src/main/org/jboss/portal/test/framework/portlet and 3 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-22 13:39:30 -0400 (Wed, 22 Aug 2007)
New Revision: 8037
Modified:
modules/portlet/trunk/jboss-portal-portlet.iws
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml
Log:
update portlet module to use test module rev 8035
Modified: modules/portlet/trunk/jboss-portal-portlet.iws
===================================================================
--- modules/portlet/trunk/jboss-portal-portlet.iws 2007-08-22 17:36:30 UTC (rev 8036)
+++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-08-22 17:39:30 UTC (rev 8037)
@@ -17,14 +17,15 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/build.xml" afterPath="$PROJECT_DIR$/portlet/build.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/build.xml" afterPath="$PROJECT_DIR$/test/build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" afterPath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" />
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" afterPath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -155,33 +156,87 @@
<component name="FavoritesProjectViewPane" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="TestDriverRegistryAccess.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java">
+ <file leaf-file-name="jboss-beans.xml" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="7" selection-start="2114" selection-end="2114" vertical-scroll-proportion="0.19235511">
+ <state line="19" column="64" selection-start="854" selection-end="854" vertical-scroll-proportion="0.21105528">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="PortletTestSuite.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java">
+ <file leaf-file-name="PortletTestDriver.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="101" column="31" selection-start="4316" selection-end="4316" vertical-scroll-proportion="0.5437731">
+ <state line="46" column="42" selection-start="2794" selection-end="2794" vertical-scroll-proportion="0.16276202">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="SessionTestCase.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java">
+ <file leaf-file-name="AbstractInfoTest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="12" selection-start="2174" selection-end="2174" vertical-scroll-proportion="0.20715167">
+ <state line="41" column="50" selection-start="2741" selection-end="2741" vertical-scroll-proportion="0.13316892">
<folding />
</state>
</provider>
</entry>
</file>
+ <file leaf-file-name="SecurityInfoTest.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="29" column="108" selection-start="2139" selection-end="2139" vertical-scroll-proportion="0.044389643">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="ExceptionsDuringRequestHandlingControllerPortlet.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="90" column="15" selection-start="4984" selection-end="4984" vertical-scroll-proportion="0.6080402">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="PortletExceptionDuringRequestHandlingPortlet.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="68" column="77" selection-start="3677" selection-end="3677" vertical-scroll-proportion="0.55778897">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="RuntimeExceptionDuringRequestHandlingPortlet.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="70" column="77" selection-start="3818" selection-end="3818" vertical-scroll-proportion="0.5879397">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="UnavailableExceptionDuringProcessActionPortlet.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="68" column="77" selection-start="3593" selection-end="3593" vertical-scroll-proportion="0.55778897">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ <file leaf-file-name="UnavailableExceptionDuringRenderPortlet.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="55" column="52" selection-start="3167" selection-end="3167" vertical-scroll-proportion="0.38471022">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
</leaf>
</component>
<component name="FindManager">
@@ -1154,104 +1209,111 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java">
+ <entry file="file://$PROJECT_DIR$/portlet/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="17" selection-start="2014" selection-end="2014" vertical-scroll-proportion="0.14796548">
+ <state line="227" column="56" selection-start="11875" selection-end="11875" vertical-scroll-proportion="0.77681875">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/container/PortletApplication.java">
+ <entry file="file://$PROJECT_DIR$/test/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="42" column="0" selection-start="1995" selection-end="2240" vertical-scroll-proportion="0.3107275">
+ <state line="162" column="93" selection-start="8435" selection-end="8435" vertical-scroll-proportion="0.30456227">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestRenderContext.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="39" column="56" selection-start="2383" selection-end="2383" vertical-scroll-proportion="0.1356784">
+ <state line="35" column="7" selection-start="2114" selection-end="2114" vertical-scroll-proportion="0.19235511">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestPortletInvocationContext.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="66" column="75" selection-start="3157" selection-end="3157" vertical-scroll-proportion="0.50308263">
+ <state line="101" column="31" selection-start="4316" selection-end="4316" vertical-scroll-proportion="0.5437731">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="829" column="63" selection-start="31326" selection-end="31326" vertical-scroll-proportion="0.76884425">
+ <state line="36" column="12" selection-start="2174" selection-end="2174" vertical-scroll-proportion="0.20715167">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/modules.ent">
+ <entry file="jar://$PROJECT_DIR$/thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.class">
<provider selected="true" editor-type-id="text-editor">
- <state line="13" column="83" selection-start="688" selection-end="720" vertical-scroll-proportion="0.19235511">
+ <state line="5" column="20" selection-start="196" selection-end="196" vertical-scroll-proportion="0.05918619">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="0" selection-start="902" selection-end="902" vertical-scroll-proportion="0.30150753">
+ <state line="19" column="64" selection-start="854" selection-end="854" vertical-scroll-proportion="0.21105528">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/classes/logging.properties">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="46" column="42" selection-start="2794" selection-end="2794" vertical-scroll-proportion="0.16276202">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="90" column="51" selection-start="3981" selection-end="3981" vertical-scroll-proportion="0.6118091">
+ <state line="41" column="50" selection-start="2741" selection-end="2741" vertical-scroll-proportion="0.13316892">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/build.xml">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="227" column="56" selection-start="11875" selection-end="11875" vertical-scroll-proportion="0.77681875">
+ <state line="29" column="108" selection-start="2139" selection-end="2139" vertical-scroll-proportion="0.044389643">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/build.xml">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="162" column="93" selection-start="8435" selection-end="8435" vertical-scroll-proportion="0.30456227">
+ <state line="90" column="15" selection-start="4984" selection-end="4984" vertical-scroll-proportion="0.6080402">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="35" column="7" selection-start="2114" selection-end="2114" vertical-scroll-proportion="0.19235511">
+ <state line="68" column="77" selection-start="3677" selection-end="3677" vertical-scroll-proportion="0.55778897">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="101" column="31" selection-start="4316" selection-end="4316" vertical-scroll-proportion="0.5437731">
+ <state line="70" column="77" selection-start="3818" selection-end="3818" vertical-scroll-proportion="0.5879397">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="36" column="12" selection-start="2174" selection-end="2174" vertical-scroll-proportion="0.20715167">
+ <state line="68" column="77" selection-start="3593" selection-end="3593" vertical-scroll-proportion="0.55778897">
<folding />
</state>
</provider>
</entry>
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="55" column="52" selection-start="3167" selection-end="3167" vertical-scroll-proportion="0.38471022">
+ <folding />
+ </state>
+ </provider>
+ </entry>
</component>
</project>
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-08-22 17:36:30 UTC (rev 8036)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-08-22 17:39:30 UTC (rev 8037)
@@ -30,7 +30,7 @@
import org.jboss.portal.test.framework.driver.DriverCommand;
import org.jboss.portal.test.framework.driver.TestDriverException;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestDriver;
+import org.jboss.portal.test.framework.driver.http.HTTPTestDriver;
import org.jboss.portal.test.framework.driver.remote.TestContext;
import java.util.HashMap;
@@ -44,7 +44,7 @@
* @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 6720 $
*/
-public class PortletTestDriver implements HttpTestDriver
+public class PortletTestDriver implements HTTPTestDriver
{
/** . */
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-08-22 17:36:30 UTC (rev 8036)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-08-22 17:39:30 UTC (rev 8037)
@@ -32,14 +32,14 @@
import org.jboss.portal.test.framework.driver.command.StartTestCommand;
import org.jboss.portal.test.framework.info.TestItemInfo;
import org.jboss.portal.test.framework.info.TestInfo;
-import org.jboss.portal.test.framework.driver.http.HttpTestDriver;
+import org.jboss.portal.test.framework.driver.http.HTTPTestDriver;
import org.jboss.portal.test.framework.driver.remote.TestContext;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public abstract class AbstractInfoTest implements HttpTestDriver
+public abstract class AbstractInfoTest implements HTTPTestDriver
{
/** The test id. */
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2007-08-22 17:36:30 UTC (rev 8036)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2007-08-22 17:39:30 UTC (rev 8037)
@@ -27,7 +27,7 @@
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.SecurityInfo;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
/**
* @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a>
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-08-22 17:36:30 UTC (rev 8036)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-08-22 17:39:30 UTC (rev 8037)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
import org.jboss.portal.test.framework.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
@@ -59,7 +59,7 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, PortletSecurityException, IOException
{
if (context.getRequestCount() == 0)
{
@@ -88,7 +88,7 @@
PortletURL url = resp.createRenderURL();
return new InvokeGetResponse(url.toString());
}
- else if (HttpTestContext.isCurrentRequestCount(5))
+ else if (HTTPTestContext.isCurrentRequestCount(5))
{
//portlets that shouldn't render itself after Exception in Action Phase
ExtendedAssert.assertEquals(false, PortletExceptionDuringRequestHandlingPortlet.rendered);
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:36:30 UTC (rev 8036)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:39:30 UTC (rev 8037)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
import org.jboss.portal.test.framework.driver.DriverResponse;
@@ -57,7 +57,7 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(2))
{
@@ -66,7 +66,7 @@
return null;
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(0))
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:36:30 UTC (rev 8036)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:39:30 UTC (rev 8037)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
import org.jboss.portal.test.framework.driver.DriverResponse;
@@ -59,7 +59,7 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(3))
{
@@ -68,7 +68,7 @@
return null;
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(0))
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-08-22 17:36:30 UTC (rev 8036)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-08-22 17:39:30 UTC (rev 8037)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
import org.jboss.portal.test.framework.driver.DriverResponse;
@@ -57,7 +57,7 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(4))
{
@@ -66,7 +66,7 @@
return null;
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(0))
{
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-08-22 17:36:30 UTC (rev 8036)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-08-22 17:39:30 UTC (rev 8037)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
import org.jboss.portal.test.framework.driver.DriverResponse;
@@ -52,7 +52,7 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(0))
{
Modified: modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-08-22 17:36:30 UTC (rev 8036)
+++ modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-08-22 17:39:30 UTC (rev 8037)
@@ -17,7 +17,7 @@
<constructor>
<parameter>socket://localhost:5400</parameter>
<parameter><inject bean="TestDriverServer"/></parameter>
- <parameter>org.jboss.portal.test.framework.driver.http.HttpTestDriver</parameter>
+ <parameter>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</parameter>
</constructor>
</bean>
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8036 - in branches/JBoss_Portal_Branch_2_6: build/ide/intellij/idea60/modules/server and 7 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-22 13:36:30 -0400 (Wed, 22 Aug 2007)
New Revision: 8036
Modified:
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java
Log:
update 2.6 to test module rev 8035
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/cms/cms.iml 2007-08-22 17:36:30 UTC (rev 8036)
@@ -188,6 +188,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml 2007-08-22 17:36:30 UTC (rev 8036)
@@ -128,6 +128,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-08-22 17:36:30 UTC (rev 8036)
@@ -167,6 +167,15 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="core" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
<javadoc-paths>
<root url="http://java.sun.com/j2ee/1.4/docs/api/" />
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileDeleteTest.java 2007-08-22 17:36:30 UTC (rev 8036)
@@ -23,7 +23,7 @@
package org.jboss.portal.test.cms.clustering;
import org.jboss.portal.test.framework.server.driver.AbstractTest;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import org.jboss.portal.test.framework.driver.remote.TestContext;
import org.jboss.portal.test.framework.server.NodeId;
@@ -80,7 +80,7 @@
{
try
{
- if (HttpTestContext.isCurrentRequestCount(0) && NodeId.PORTS_01.equals(NodeId.locate()))
+ if (HTTPTestContext.isCurrentRequestCount(0) && NodeId.PORTS_01.equals(NodeId.locate()))
{
System.out.println("-------------------------------------------------------");
System.out.println("Performing SetUp on..." + NodeId.PORTS_01 + "(createTestFileDelete)");
@@ -108,10 +108,10 @@
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
String s = invocation.getResponse().renderURL(url);
- s = HttpTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02);
+ s = HTTPTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02);
return new InvokeGetResponse(s);
}
- else if (HttpTestContext.isCurrentRequestCount(1) && NodeId.PORTS_02.equals(NodeId.locate()))
+ else if (HTTPTestContext.isCurrentRequestCount(1) && NodeId.PORTS_02.equals(NodeId.locate()))
{
System.out.println("-------------------------------------------------------");
System.out.println("Performing SetUp on node..." + NodeId.PORTS_02 + "(createTestFileDelete)");
@@ -134,10 +134,10 @@
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
String s = invocation.getResponse().renderURL(url);
- s = HttpTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_01);
+ s = HTTPTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_01);
return new InvokeGetResponse(s);
}
- else if (HttpTestContext.isCurrentRequestCount(2) && NodeId.PORTS_01.equals(NodeId.locate()))
+ else if (HTTPTestContext.isCurrentRequestCount(2) && NodeId.PORTS_01.equals(NodeId.locate()))
{
System.out.println("-------------------------------------------------------");
System.out.println("Performing FileDelete on..." + NodeId.PORTS_01 + "(createTestFileDelete)");
@@ -174,10 +174,10 @@
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
String s = invocation.getResponse().renderURL(url);
- s = HttpTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02);
+ s = HTTPTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02);
return new InvokeGetResponse(s);
}
- else if (HttpTestContext.isCurrentRequestCount(3) && NodeId.PORTS_02.equals(NodeId.locate()))
+ else if (HTTPTestContext.isCurrentRequestCount(3) && NodeId.PORTS_02.equals(NodeId.locate()))
{
System.out.println("-------------------------------------------------------");
System.out.println("Checking FileDelete on node..." + NodeId.PORTS_02 + "(createTestFileDelete)");
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/test/cms/clustering/FileUpdateTest.java 2007-08-22 17:36:30 UTC (rev 8036)
@@ -34,7 +34,7 @@
import org.jboss.portal.test.framework.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
import org.jboss.portal.test.framework.server.driver.AbstractTest;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import org.jboss.portal.test.framework.driver.remote.TestContext;
import org.jboss.portal.test.framework.server.NodeId;
@@ -80,7 +80,7 @@
{
try
{
- if (HttpTestContext.isCurrentRequestCount(0) && NodeId.PORTS_01.equals(NodeId.locate()))
+ if (HTTPTestContext.isCurrentRequestCount(0) && NodeId.PORTS_01.equals(NodeId.locate()))
{
System.out.println("-------------------------------------------------------");
System.out.println("Performing SetUp on..." + NodeId.PORTS_01 + "(createTestFileUpdate)");
@@ -116,10 +116,10 @@
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
String s = invocation.getResponse().renderURL(url);
- s = HttpTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02);
+ s = HTTPTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02);
return new InvokeGetResponse(s);
}
- else if (HttpTestContext.isCurrentRequestCount(1) && NodeId.PORTS_02.equals(NodeId.locate()))
+ else if (HTTPTestContext.isCurrentRequestCount(1) && NodeId.PORTS_02.equals(NodeId.locate()))
{
System.out.println("-------------------------------------------------------");
System.out.println("Performing SetUp on node..." + NodeId.PORTS_02 + "(createTestFileUpdate)");
@@ -155,10 +155,10 @@
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
String s = invocation.getResponse().renderURL(url);
- s = HttpTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_01);
+ s = HTTPTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_01);
return new InvokeGetResponse(s);
}
- else if (HttpTestContext.isCurrentRequestCount(2) && NodeId.PORTS_01.equals(NodeId.locate()))
+ else if (HTTPTestContext.isCurrentRequestCount(2) && NodeId.PORTS_01.equals(NodeId.locate()))
{
System.out.println("-------------------------------------------------------");
System.out.println("Performing FileUpdate on..." + NodeId.PORTS_01 + "(createTestFileUpdate)");
@@ -208,10 +208,10 @@
AbstractServerURL url = new AbstractServerURL();
url.setPortalRequestPath("/index.html");
String s = invocation.getResponse().renderURL(url);
- s = HttpTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02);
+ s = HTTPTestContext.getCurrentContext().rewriteURLForNode(s, NodeId.PORTS_02);
return new InvokeGetResponse(s);
}
- else if (HttpTestContext.isCurrentRequestCount(3) && NodeId.PORTS_02.equals(NodeId.locate()))
+ else if (HTTPTestContext.isCurrentRequestCount(3) && NodeId.PORTS_02.equals(NodeId.locate()))
{
System.out.println("-------------------------------------------------------");
System.out.println("Checking FileUpdate on node..." + NodeId.PORTS_02 + "(createTestFileUpdate)");
Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-08-22 17:36:30 UTC (rev 8036)
@@ -30,7 +30,7 @@
import org.jboss.portal.test.framework.driver.DriverCommand;
import org.jboss.portal.test.framework.driver.TestDriverException;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestDriver;
+import org.jboss.portal.test.framework.driver.http.HTTPTestDriver;
import org.jboss.portal.test.framework.driver.remote.TestContext;
import java.util.HashMap;
@@ -44,7 +44,7 @@
* @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a>
* @version $Revision: 6720 $
*/
-public class PortletTestDriver implements HttpTestDriver
+public class PortletTestDriver implements HTTPTestDriver
{
/** . */
Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-08-22 17:36:30 UTC (rev 8036)
@@ -32,14 +32,14 @@
import org.jboss.portal.test.framework.driver.command.StartTestCommand;
import org.jboss.portal.test.framework.info.TestItemInfo;
import org.jboss.portal.test.framework.info.TestInfo;
-import org.jboss.portal.test.framework.driver.http.HttpTestDriver;
+import org.jboss.portal.test.framework.driver.http.HTTPTestDriver;
import org.jboss.portal.test.framework.driver.remote.TestContext;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public abstract class AbstractInfoTest implements HttpTestDriver
+public abstract class AbstractInfoTest implements HTTPTestDriver
{
/** The test id. */
Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/info/SecurityInfoTest.java 2007-08-22 17:36:30 UTC (rev 8036)
@@ -27,7 +27,6 @@
import org.jboss.portal.portlet.info.PortletInfo;
import org.jboss.portal.portlet.info.SecurityInfo;
import org.jboss.portal.common.junit.ExtendedAssert;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
/**
* @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a>
Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/ExceptionsDuringRequestHandlingControllerPortlet.java 2007-08-22 17:36:30 UTC (rev 8036)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
import org.jboss.portal.test.framework.driver.response.EndTestResponse;
import org.jboss.portal.test.framework.driver.DriverResponse;
import org.jboss.portal.common.junit.ExtendedAssert;
@@ -59,7 +59,7 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, PortletSecurityException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, PortletSecurityException, IOException
{
if (context.getRequestCount() == 0)
{
@@ -88,7 +88,7 @@
PortletURL url = resp.createRenderURL();
return new InvokeGetResponse(url.toString());
}
- else if (HttpTestContext.isCurrentRequestCount(5))
+ else if (HTTPTestContext.isCurrentRequestCount(5))
{
//portlets that shouldn't render itself after Exception in Action Phase
ExtendedAssert.assertEquals(false, PortletExceptionDuringRequestHandlingPortlet.rendered);
Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/PortletExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:36:30 UTC (rev 8036)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
import org.jboss.portal.test.framework.driver.DriverResponse;
@@ -57,7 +57,7 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(2))
{
@@ -66,7 +66,7 @@
return null;
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(0))
{
Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/RuntimeExceptionDuringRequestHandlingPortlet.java 2007-08-22 17:36:30 UTC (rev 8036)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
import org.jboss.portal.test.framework.driver.DriverResponse;
@@ -59,7 +59,7 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(3))
{
@@ -68,7 +68,7 @@
return null;
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(0))
{
Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringProcessActionPortlet.java 2007-08-22 17:36:30 UTC (rev 8036)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
import org.jboss.portal.test.framework.driver.DriverResponse;
@@ -57,7 +57,7 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doProcessAction(ActionRequest req, ActionResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(4))
{
@@ -66,7 +66,7 @@
return null;
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(0))
{
Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/spec/UnavailableExceptionDuringRenderPortlet.java 2007-08-22 17:36:30 UTC (rev 8036)
@@ -22,9 +22,9 @@
******************************************************************************/
package org.jboss.portal.test.portlet.jsr168.tck.portletinterface.spec;
-import org.jboss.portal.test.framework.driver.http.HttpTestContext;
import org.jboss.portal.test.framework.portlet.components.AbstractTestPortlet;
import org.jboss.portal.test.framework.driver.DriverResponse;
+import org.jboss.portal.test.framework.driver.http.HTTPTestContext;
import javax.portlet.PortletException;
import javax.portlet.RenderRequest;
@@ -52,7 +52,7 @@
return "ExceptionsDuringRequestHandlingPortlet";
}
- protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HttpTestContext context) throws PortletException, IOException
+ protected DriverResponse doRender(RenderRequest req, RenderResponse resp, HTTPTestContext context) throws PortletException, IOException
{
if (context.isRequestCount(0))
{
Modified: branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/server/src/main/org/jboss/portal/test/framework/server/driver/AbstractTest.java 2007-08-22 17:36:30 UTC (rev 8036)
@@ -25,14 +25,14 @@
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.test.framework.driver.DriverResponse;
import org.jboss.portal.test.framework.driver.response.ErrorResponse;
-import org.jboss.portal.test.framework.driver.http.HttpTestCase;
+import org.jboss.portal.test.framework.driver.http.HTTPTestCase;
import org.jboss.portal.test.framework.driver.remote.TestContext;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public abstract class AbstractTest extends HttpTestCase
+public abstract class AbstractTest extends HTTPTestCase
{
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java 2007-08-22 17:21:20 UTC (rev 8035)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java 2007-08-22 17:36:30 UTC (rev 8036)
@@ -37,7 +37,7 @@
import org.jboss.portal.test.framework.info.TestItemInfo;
import org.jboss.portal.test.framework.junit.POJOJUnitTest;
import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.test.framework.driver.http.HttpTestDriver;
+import org.jboss.portal.test.framework.driver.http.HTTPTestDriver;
import org.jboss.portal.test.framework.driver.remote.TestContext;
/**
@@ -48,7 +48,7 @@
* @author <a href="mailto:Boleslaw.Dawidowicz@jboss.org">Boleslaw Dawidowicz</a>
* @since 2.4 (Feb 20, 2006)
*/
-public abstract class WSRPBaseTest extends AbstractJBossService implements HttpTestDriver
+public abstract class WSRPBaseTest extends AbstractJBossService implements HTTPTestDriver
{
Logger log = Logger.getLogger(WSRPBaseTest.class);
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8035 - in modules/test/trunk/test/src: main/org/jboss/portal/test/framework/driver/http/command and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-22 13:21:20 -0400 (Wed, 22 Aug 2007)
New Revision: 8035
Added:
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestCase.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestContext.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestDriver.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestDriverClient.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HTTPDriverCommand.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HTTPDriverCommandContext.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HTTPDriverResponse.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HTTPDriverResponseContext.java
Modified:
modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml
Log:
re added previous delete classes but with correct case
Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestCase.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestCase.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestCase.java 2007-08-22 17:21:20 UTC (rev 8035)
@@ -0,0 +1,81 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http;
+
+import org.jboss.portal.test.framework.driver.DriverResponse;
+import org.jboss.portal.test.framework.driver.DriverCommand;
+import org.jboss.portal.test.framework.driver.TestDriverException;
+import org.jboss.portal.test.framework.driver.command.StartTestCommand;
+import org.jboss.portal.test.framework.driver.response.ErrorResponse;
+import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
+import org.jboss.portal.test.framework.driver.remote.TestContext;
+import org.jboss.portal.test.framework.driver.remote.RemoteTestCase;
+
+/**
+ * Defines an http test case working from the server side point of view.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5636 $
+ */
+public abstract class HTTPTestCase extends RemoteTestCase
+{
+
+ /** The test path. */
+ protected final String path;
+
+ public HTTPTestCase(String testCaseId, String path)
+ {
+ super(testCaseId);
+
+ //
+ this.path = path;
+ }
+
+ /**
+ * The implementation will return an <code>InvokeGetResponse</code> response in reaction to the <code>StartTestCommand</code>.
+ * All other commands will be delegated to the <code>execute(DriverCommand,TestContext)</code>
+ */
+ public DriverResponse invoke(String testId, DriverCommand cmd) throws TestDriverException
+ {
+ if (cmd instanceof StartTestCommand)
+ {
+ return new InvokeGetResponse(path);
+ }
+ else
+ {
+ try
+ {
+ return execute(cmd, context);
+ }
+ catch (Exception e)
+ {
+ return new ErrorResponse(e);
+ }
+ }
+ }
+
+ public DriverResponse execute(DriverCommand driverCommand, TestContext testContext) throws Exception
+ {
+ return new ErrorResponse("No default implementation");
+ }
+}
Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestContext.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestContext.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestContext.java 2007-08-22 17:21:20 UTC (rev 8035)
@@ -0,0 +1,108 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http;
+
+import org.jboss.portal.test.framework.driver.remote.TestContext;
+import org.jboss.portal.test.framework.driver.DriverResponse;
+import org.jboss.portal.test.framework.TestParametrization;
+
+/**
+ * The test context seen from the server side.
+ * @todo make a client side context and a server side context, basically (server side context == client side context + services)
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 5498 $
+ */
+public class HTTPTestContext extends TestContext
+{
+
+ /**
+ * Return the current test case context.
+ *
+ * @return the current test context
+ * @throws IllegalStateException if there is no current context
+ */
+ public static HTTPTestContext getCurrentContext() throws IllegalStateException
+ {
+ throw new UnsupportedOperationException("Don't use this API");
+ }
+
+ /**
+ * Return the current test case context or null if none exist.
+ *
+ * @return the current test context
+ */
+ public static HTTPTestContext peekCurrentContext()
+ {
+ throw new UnsupportedOperationException("Don't use this API");
+ }
+
+ /**
+ * Set the current context.
+ *
+ * @param newContext the test case context
+ */
+ public static void setCurrentContext(HTTPTestContext newContext)
+ {
+ throw new UnsupportedOperationException("Don't use this API");
+ }
+
+ public static boolean isCurrentRequestCount(int count) throws IllegalStateException
+ {
+ return getCurrentContext().requestCount == count;
+ }
+
+ public static int getCurrentRequestCount() throws IllegalStateException
+ {
+ return getCurrentContext().requestCount;
+ }
+
+ public static DriverResponse getCurrentResponse() throws IllegalStateException
+ {
+ HTTPTestContext ctx = getCurrentContext();
+ if (ctx != null)
+ {
+ return ctx.response;
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public static void setCurrentResponse(DriverResponse currentResponse) throws IllegalStateException
+ {
+ HTTPTestContext ctx = getCurrentContext();
+ ctx.setResponse(currentResponse);
+ }
+
+ public HTTPTestContext(TestContext that)
+ {
+ super(that);
+ }
+
+ public HTTPTestContext(int requestCount, String archivePath, TestParametrization parametrization)
+ {
+ super(requestCount, archivePath, parametrization);
+ }
+}
Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestDriver.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestDriver.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestDriver.java 2007-08-22 17:21:20 UTC (rev 8035)
@@ -0,0 +1,33 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http;
+
+import org.jboss.portal.test.framework.driver.remote.RemoteTestDriver;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface HTTPTestDriver extends RemoteTestDriver
+{
+}
Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestDriverClient.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestDriverClient.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestDriverClient.java 2007-08-22 17:21:20 UTC (rev 8035)
@@ -0,0 +1,39 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http;
+
+import org.jboss.portal.test.framework.driver.remote.RemoteTestDriverClient;
+import org.jboss.portal.test.framework.driver.remote.TestConversation;
+import org.jboss.portal.test.framework.server.Node;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class HTTPTestDriverClient extends RemoteTestDriverClient
+{
+ protected TestConversation createConversation(String testId, Node node)
+ {
+ return new HTTPTestConversation(this, testId, node);
+ }
+}
Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HTTPDriverCommand.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HTTPDriverCommand.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HTTPDriverCommand.java 2007-08-22 17:21:20 UTC (rev 8035)
@@ -0,0 +1,33 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http.command;
+
+import org.jboss.portal.test.framework.driver.DriverCommand;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class HTTPDriverCommand extends DriverCommand
+{
+}
Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HTTPDriverCommandContext.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HTTPDriverCommandContext.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HTTPDriverCommandContext.java 2007-08-22 17:21:20 UTC (rev 8035)
@@ -0,0 +1,46 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http.command;
+
+import org.jboss.portal.test.framework.driver.DriverCommand;
+import org.jboss.portal.test.framework.driver.remote.command.RemoteDriverCommandContext;
+import org.jboss.portal.test.framework.driver.remote.response.RemoteDriverResponseContext;
+
+/**
+ * The context of the command invoked by the client.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class HTTPDriverCommandContext extends RemoteDriverCommandContext
+{
+ public HTTPDriverCommandContext(RemoteDriverResponseContext responseContext, DriverCommand command)
+ {
+ super(responseContext, command);
+ }
+
+ public HTTPDriverCommandContext(DriverCommand command)
+ {
+ super(command);
+ }
+}
Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HTTPDriverResponse.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HTTPDriverResponse.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HTTPDriverResponse.java 2007-08-22 17:21:20 UTC (rev 8035)
@@ -0,0 +1,33 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http.response;
+
+import org.jboss.portal.test.framework.driver.DriverResponse;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public abstract class HTTPDriverResponse extends DriverResponse
+{
+}
Added: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HTTPDriverResponseContext.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HTTPDriverResponseContext.java (rev 0)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HTTPDriverResponseContext.java 2007-08-22 17:21:20 UTC (rev 8035)
@@ -0,0 +1,58 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http.response;
+
+import org.apache.commons.httpclient.HttpMethod;
+import org.jboss.portal.test.framework.driver.DriverResponse;
+import org.jboss.portal.test.framework.driver.remote.response.RemoteDriverResponseContext;
+
+/**
+ * The context of the response received by the client.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class HTTPDriverResponseContext extends RemoteDriverResponseContext
+{
+
+ /** The http method if not null. */
+ private HttpMethod httpMethod;
+
+ public HTTPDriverResponseContext(HttpMethod httpMethod, DriverResponse response)
+ {
+ super(response);
+
+ //
+ this.httpMethod = httpMethod;
+ }
+
+ public HTTPDriverResponseContext(DriverResponse response)
+ {
+ this(null, response);
+ }
+
+ public HttpMethod getHttpMethod()
+ {
+ return httpMethod;
+ }
+}
Modified: modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml
===================================================================
--- modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-22 17:18:22 UTC (rev 8034)
+++ modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-22 17:21:20 UTC (rev 8035)
@@ -46,7 +46,7 @@
<constructor>
<parameter><inject bean="MBeanServerFactory0" property="server"/></parameter>
<parameter><value>portal.test:service=TestDriverServer</value></parameter>
- <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter>
+ <parameter><value>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</value></parameter>
</constructor>
</bean>
@@ -62,7 +62,7 @@
<constructor>
<parameter><inject bean="MBeanServerFactory0" property="server"/></parameter>
<parameter><value>portal.test:service=TestDriverServer</value></parameter>
- <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter>
+ <parameter><value>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</value></parameter>
</constructor>
</bean>
@@ -78,7 +78,7 @@
<constructor>
<parameter><inject bean="MBeanServerFactory0" property="server"/></parameter>
<parameter><value>portal.test:service=TestDriverServer</value></parameter>
- <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter>
+ <parameter><value>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</value></parameter>
</constructor>
</bean>
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8034 - in modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http: command and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-22 13:18:22 -0400 (Wed, 22 Aug 2007)
New Revision: 8034
Removed:
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriver.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommandContext.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponse.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponseContext.java
Log:
temporarily remove Http classes are they were not renamed correctly - transient state
Deleted: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java 2007-08-22 17:14:44 UTC (rev 8033)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java 2007-08-22 17:18:22 UTC (rev 8034)
@@ -1,81 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http;
-
-import org.jboss.portal.test.framework.driver.DriverResponse;
-import org.jboss.portal.test.framework.driver.DriverCommand;
-import org.jboss.portal.test.framework.driver.TestDriverException;
-import org.jboss.portal.test.framework.driver.command.StartTestCommand;
-import org.jboss.portal.test.framework.driver.response.ErrorResponse;
-import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
-import org.jboss.portal.test.framework.driver.remote.TestContext;
-import org.jboss.portal.test.framework.driver.remote.RemoteTestCase;
-
-/**
- * Defines an http test case working from the server side point of view.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5636 $
- */
-public abstract class HTTPTestCase extends RemoteTestCase
-{
-
- /** The test path. */
- protected final String path;
-
- public HTTPTestCase(String testCaseId, String path)
- {
- super(testCaseId);
-
- //
- this.path = path;
- }
-
- /**
- * The implementation will return an <code>InvokeGetResponse</code> response in reaction to the <code>StartTestCommand</code>.
- * All other commands will be delegated to the <code>execute(DriverCommand,TestContext)</code>
- */
- public DriverResponse invoke(String testId, DriverCommand cmd) throws TestDriverException
- {
- if (cmd instanceof StartTestCommand)
- {
- return new InvokeGetResponse(path);
- }
- else
- {
- try
- {
- return execute(cmd, context);
- }
- catch (Exception e)
- {
- return new ErrorResponse(e);
- }
- }
- }
-
- public DriverResponse execute(DriverCommand driverCommand, TestContext testContext) throws Exception
- {
- return new ErrorResponse("No default implementation");
- }
-}
Deleted: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-08-22 17:14:44 UTC (rev 8033)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-08-22 17:18:22 UTC (rev 8034)
@@ -1,108 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http;
-
-import org.jboss.portal.test.framework.driver.remote.TestContext;
-import org.jboss.portal.test.framework.driver.DriverResponse;
-import org.jboss.portal.test.framework.TestParametrization;
-
-/**
- * The test context seen from the server side.
- * @todo make a client side context and a server side context, basically (server side context == client side context + services)
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 5498 $
- */
-public class HTTPTestContext extends TestContext
-{
-
- /**
- * Return the current test case context.
- *
- * @return the current test context
- * @throws IllegalStateException if there is no current context
- */
- public static HTTPTestContext getCurrentContext() throws IllegalStateException
- {
- throw new UnsupportedOperationException("Don't use this API");
- }
-
- /**
- * Return the current test case context or null if none exist.
- *
- * @return the current test context
- */
- public static HTTPTestContext peekCurrentContext()
- {
- throw new UnsupportedOperationException("Don't use this API");
- }
-
- /**
- * Set the current context.
- *
- * @param newContext the test case context
- */
- public static void setCurrentContext(HTTPTestContext newContext)
- {
- throw new UnsupportedOperationException("Don't use this API");
- }
-
- public static boolean isCurrentRequestCount(int count) throws IllegalStateException
- {
- return getCurrentContext().requestCount == count;
- }
-
- public static int getCurrentRequestCount() throws IllegalStateException
- {
- return getCurrentContext().requestCount;
- }
-
- public static DriverResponse getCurrentResponse() throws IllegalStateException
- {
- HTTPTestContext ctx = getCurrentContext();
- if (ctx != null)
- {
- return ctx.response;
- }
- else
- {
- return null;
- }
- }
-
- public static void setCurrentResponse(DriverResponse currentResponse) throws IllegalStateException
- {
- HTTPTestContext ctx = getCurrentContext();
- ctx.setResponse(currentResponse);
- }
-
- public HTTPTestContext(TestContext that)
- {
- super(that);
- }
-
- public HTTPTestContext(int requestCount, String archivePath, TestParametrization parametrization)
- {
- super(requestCount, archivePath, parametrization);
- }
-}
Deleted: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriver.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriver.java 2007-08-22 17:14:44 UTC (rev 8033)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriver.java 2007-08-22 17:18:22 UTC (rev 8034)
@@ -1,33 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http;
-
-import org.jboss.portal.test.framework.driver.remote.RemoteTestDriver;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public interface HTTPTestDriver extends RemoteTestDriver
-{
-}
Deleted: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java 2007-08-22 17:14:44 UTC (rev 8033)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java 2007-08-22 17:18:22 UTC (rev 8034)
@@ -1,39 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http;
-
-import org.jboss.portal.test.framework.driver.remote.RemoteTestDriverClient;
-import org.jboss.portal.test.framework.driver.remote.TestConversation;
-import org.jboss.portal.test.framework.server.Node;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class HTTPTestDriverClient extends RemoteTestDriverClient
-{
- protected TestConversation createConversation(String testId, Node node)
- {
- return new HTTPTestConversation(this, testId, node);
- }
-}
Deleted: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.java 2007-08-22 17:14:44 UTC (rev 8033)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.java 2007-08-22 17:18:22 UTC (rev 8034)
@@ -1,33 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http.command;
-
-import org.jboss.portal.test.framework.driver.DriverCommand;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class HTTPDriverCommand extends DriverCommand
-{
-}
Deleted: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommandContext.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommandContext.java 2007-08-22 17:14:44 UTC (rev 8033)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommandContext.java 2007-08-22 17:18:22 UTC (rev 8034)
@@ -1,46 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http.command;
-
-import org.jboss.portal.test.framework.driver.DriverCommand;
-import org.jboss.portal.test.framework.driver.remote.command.RemoteDriverCommandContext;
-import org.jboss.portal.test.framework.driver.remote.response.RemoteDriverResponseContext;
-
-/**
- * The context of the command invoked by the client.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class HTTPDriverCommandContext extends RemoteDriverCommandContext
-{
- public HTTPDriverCommandContext(RemoteDriverResponseContext responseContext, DriverCommand command)
- {
- super(responseContext, command);
- }
-
- public HTTPDriverCommandContext(DriverCommand command)
- {
- super(command);
- }
-}
Deleted: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponse.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponse.java 2007-08-22 17:14:44 UTC (rev 8033)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponse.java 2007-08-22 17:18:22 UTC (rev 8034)
@@ -1,33 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http.response;
-
-import org.jboss.portal.test.framework.driver.DriverResponse;
-
-/**
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public abstract class HTTPDriverResponse extends DriverResponse
-{
-}
Deleted: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponseContext.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponseContext.java 2007-08-22 17:14:44 UTC (rev 8033)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponseContext.java 2007-08-22 17:18:22 UTC (rev 8034)
@@ -1,58 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, 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.test.framework.driver.http.response;
-
-import org.apache.commons.httpclient.HttpMethod;
-import org.jboss.portal.test.framework.driver.DriverResponse;
-import org.jboss.portal.test.framework.driver.remote.response.RemoteDriverResponseContext;
-
-/**
- * The context of the response received by the client.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public class HTTPDriverResponseContext extends RemoteDriverResponseContext
-{
-
- /** The http method if not null. */
- private HttpMethod httpMethod;
-
- public HTTPDriverResponseContext(HttpMethod httpMethod, DriverResponse response)
- {
- super(response);
-
- //
- this.httpMethod = httpMethod;
- }
-
- public HTTPDriverResponseContext(DriverResponse response)
- {
- this(null, response);
- }
-
- public HttpMethod getHttpMethod()
- {
- return httpMethod;
- }
-}
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8033 - in modules/test/trunk/test/src: main/org/jboss/portal/test/framework/driver/http/command and 3 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-22 13:14:44 -0400 (Wed, 22 Aug 2007)
New Revision: 8033
Modified:
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestConversation.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriver.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoGetCommand.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoPostCommand.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommandContext.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/SendResponseCommand.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponse.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponseContext.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokeGetResponse.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokePostResponse.java
modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/SendResponseResponse.java
modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml
modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml
modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml
Log:
correctly and consistent name the http test driver stuff HTTP instead of Http since it is an acronym
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestConversation.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestConversation.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestConversation.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -37,13 +37,13 @@
import org.apache.commons.httpclient.params.HttpMethodParams;
import org.apache.log4j.Logger;
import org.jboss.portal.test.framework.server.Node;
-import org.jboss.portal.test.framework.driver.http.command.HttpDriverCommandContext;
-import org.jboss.portal.test.framework.driver.http.command.HttpDriverCommand;
+import org.jboss.portal.test.framework.driver.http.command.HTTPDriverCommandContext;
+import org.jboss.portal.test.framework.driver.http.command.HTTPDriverCommand;
import org.jboss.portal.test.framework.driver.http.command.DoGetCommand;
import org.jboss.portal.test.framework.driver.http.command.DoPostCommand;
import org.jboss.portal.test.framework.driver.http.command.SendResponseCommand;
-import org.jboss.portal.test.framework.driver.http.response.HttpDriverResponseContext;
-import org.jboss.portal.test.framework.driver.http.response.HttpDriverResponse;
+import org.jboss.portal.test.framework.driver.http.response.HTTPDriverResponseContext;
+import org.jboss.portal.test.framework.driver.http.response.HTTPDriverResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokeGetResponse;
import org.jboss.portal.test.framework.driver.http.response.InvokePostResponse;
import org.jboss.portal.test.framework.driver.remote.TestConversation;
@@ -78,7 +78,7 @@
private final Logger log = Logger.getLogger(getClass());
/** . */
- private final HttpTestDriverClient driver;
+ private final HTTPTestDriverClient driver;
/** The node to invoke. */
private Node node;
@@ -92,7 +92,7 @@
/** The test parametrization. */
private TestParametrization parametrization;
- public HTTPTestConversation(HttpTestDriverClient driver, String testId, Node node)
+ public HTTPTestConversation(HTTPTestDriverClient driver, String testId, Node node)
{
super(driver, testId);
@@ -108,14 +108,14 @@
protected RemoteDriverCommandContext createContext(DriverCommand command)
{
- return new HttpDriverCommandContext(command);
+ return new HTTPDriverCommandContext(command);
}
protected DriverCommand createCommand(RemoteDriverResponseContext responseContext) throws Exception
{
- if (responseContext.getResponse() instanceof HttpDriverResponse)
+ if (responseContext.getResponse() instanceof HTTPDriverResponse)
{
- return createHTTPCommand((HttpDriverResponseContext)responseContext);
+ return createHTTPCommand((HTTPDriverResponseContext)responseContext);
}
else
{
@@ -207,18 +207,18 @@
pushContext();
DriverResponse response = driver.getServer(node).invoke(testId, command);
requestCount = 0;
- return new HttpDriverResponseContext(response);
+ return new HTTPDriverResponseContext(response);
}
else if (command instanceof SendResponseCommand)
{
pushContext();
DriverResponse response = driver.getServer(node).invoke(testId, command);
requestCount++;
- return new HttpDriverResponseContext(response);
+ return new HTTPDriverResponseContext(response);
}
else
{
- return new HttpDriverResponseContext(new ErrorResponse("Unexpected response"));
+ return new HTTPDriverResponseContext(new ErrorResponse("Unexpected response"));
}
}
@@ -226,7 +226,7 @@
* Create an http command from an http response.
* @param responseContext
*/
- protected HttpDriverCommand createHTTPCommand(HttpDriverResponseContext responseContext) throws Exception
+ protected HTTPDriverCommand createHTTPCommand(HTTPDriverResponseContext responseContext) throws Exception
{
DriverResponse resp = responseContext.getResponse();
if (resp instanceof InvokeGetResponse)
@@ -273,7 +273,7 @@
}
}
- private HttpDriverResponseContext decodeHTTPResponse(HttpMethod httpMethod) throws Exception
+ private HTTPDriverResponseContext decodeHTTPResponse(HttpMethod httpMethod) throws Exception
{
TestContext ctx = popContext();
DriverResponse response = ctx.getResponse();
@@ -289,7 +289,7 @@
{
log.info("# Received '200' code");
requestCount++;
- return new HttpDriverResponseContext(httpMethod, response);
+ return new HTTPDriverResponseContext(httpMethod, response);
}
// Send redirect
case 302:
@@ -298,7 +298,7 @@
{
log.info("# Received Result object which overrides the 302");
requestCount++;
- return new HttpDriverResponseContext(httpMethod, response);
+ return new HTTPDriverResponseContext(httpMethod, response);
}
// Otherwise satisfy the 302 code
@@ -311,21 +311,21 @@
// For now we don't add any contextual payload as
// 302 is some kind of implicit redirect response
- return (HttpDriverResponseContext)invoke(new HttpDriverCommandContext(cmd));
+ return (HTTPDriverResponseContext)invoke(new HTTPDriverCommandContext(cmd));
}
else
{
// The response is invalid
- return new HttpDriverResponseContext(httpMethod, new FailureResponse("302 Code with corrupted data"));
+ return new HTTPDriverResponseContext(httpMethod, new FailureResponse("302 Code with corrupted data"));
}
case 500:
log.info("# Received '500' code");
- return new HttpDriverResponseContext(httpMethod, new FailureResponse("Received '500' code at " + httpMethod.getURI()));
+ return new HTTPDriverResponseContext(httpMethod, new FailureResponse("Received '500' code at " + httpMethod.getURI()));
case 404:
log.info("# Received '404' code");
- return new HttpDriverResponseContext(httpMethod, new FailureResponse("Received '404' code at " + httpMethod.getURI()));
+ return new HTTPDriverResponseContext(httpMethod, new FailureResponse("Received '404' code at " + httpMethod.getURI()));
default:
- return new HttpDriverResponseContext(httpMethod, new ErrorResponse("Unexpected http code " + status + " at " + httpMethod.getURI()));
+ return new HTTPDriverResponseContext(httpMethod, new ErrorResponse("Unexpected http code " + status + " at " + httpMethod.getURI()));
}
}
@@ -372,7 +372,7 @@
private void pushContext()
{
- HttpTestContext ctx = new HttpTestContext(requestCount, driver.getArchivePath(), parametrization);
+ HTTPTestContext ctx = new HTTPTestContext(requestCount, driver.getArchivePath(), parametrization);
log.info("# Updating test case context of : " + node + " : " + ctx);
RemoteTestDriver agent = driver.getServer(node);
agent.pushContext(testId, ctx);
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -37,13 +37,13 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5636 $
*/
-public abstract class HttpTestCase extends RemoteTestCase
+public abstract class HTTPTestCase extends RemoteTestCase
{
/** The test path. */
protected final String path;
- public HttpTestCase(String testCaseId, String path)
+ public HTTPTestCase(String testCaseId, String path)
{
super(testCaseId);
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -33,7 +33,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5498 $
*/
-public class HttpTestContext extends TestContext
+public class HTTPTestContext extends TestContext
{
/**
@@ -42,7 +42,7 @@
* @return the current test context
* @throws IllegalStateException if there is no current context
*/
- public static HttpTestContext getCurrentContext() throws IllegalStateException
+ public static HTTPTestContext getCurrentContext() throws IllegalStateException
{
throw new UnsupportedOperationException("Don't use this API");
}
@@ -52,7 +52,7 @@
*
* @return the current test context
*/
- public static HttpTestContext peekCurrentContext()
+ public static HTTPTestContext peekCurrentContext()
{
throw new UnsupportedOperationException("Don't use this API");
}
@@ -62,7 +62,7 @@
*
* @param newContext the test case context
*/
- public static void setCurrentContext(HttpTestContext newContext)
+ public static void setCurrentContext(HTTPTestContext newContext)
{
throw new UnsupportedOperationException("Don't use this API");
}
@@ -79,7 +79,7 @@
public static DriverResponse getCurrentResponse() throws IllegalStateException
{
- HttpTestContext ctx = getCurrentContext();
+ HTTPTestContext ctx = getCurrentContext();
if (ctx != null)
{
return ctx.response;
@@ -92,16 +92,16 @@
public static void setCurrentResponse(DriverResponse currentResponse) throws IllegalStateException
{
- HttpTestContext ctx = getCurrentContext();
+ HTTPTestContext ctx = getCurrentContext();
ctx.setResponse(currentResponse);
}
- public HttpTestContext(TestContext that)
+ public HTTPTestContext(TestContext that)
{
super(that);
}
- public HttpTestContext(int requestCount, String archivePath, TestParametrization parametrization)
+ public HTTPTestContext(int requestCount, String archivePath, TestParametrization parametrization)
{
super(requestCount, archivePath, parametrization);
}
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriver.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriver.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriver.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -28,6 +28,6 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public interface HttpTestDriver extends RemoteTestDriver
+public interface HTTPTestDriver extends RemoteTestDriver
{
}
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverClient.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -30,7 +30,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class HttpTestDriverClient extends RemoteTestDriverClient
+public class HTTPTestDriverClient extends RemoteTestDriverClient
{
protected TestConversation createConversation(String testId, Node node)
{
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoGetCommand.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoGetCommand.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoGetCommand.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -30,7 +30,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5448 $
*/
-public class DoGetCommand extends HttpDriverCommand
+public class DoGetCommand extends HTTPDriverCommand
{
/** . */
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoPostCommand.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoPostCommand.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/DoPostCommand.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -28,7 +28,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5448 $
*/
-public class DoPostCommand extends HttpDriverCommand
+public class DoPostCommand extends HTTPDriverCommand
{
private String url;
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommand.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -28,6 +28,6 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class HttpDriverCommand extends DriverCommand
+public class HTTPDriverCommand extends DriverCommand
{
}
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommandContext.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommandContext.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/HttpDriverCommandContext.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -32,14 +32,14 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class HttpDriverCommandContext extends RemoteDriverCommandContext
+public class HTTPDriverCommandContext extends RemoteDriverCommandContext
{
- public HttpDriverCommandContext(RemoteDriverResponseContext responseContext, DriverCommand command)
+ public HTTPDriverCommandContext(RemoteDriverResponseContext responseContext, DriverCommand command)
{
super(responseContext, command);
}
- public HttpDriverCommandContext(DriverCommand command)
+ public HTTPDriverCommandContext(DriverCommand command)
{
super(command);
}
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/SendResponseCommand.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/SendResponseCommand.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/command/SendResponseCommand.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -28,7 +28,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class SendResponseCommand extends HttpDriverCommand
+public class SendResponseCommand extends HTTPDriverCommand
{
/** . */
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponse.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponse.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponse.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -28,6 +28,6 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public abstract class HttpDriverResponse extends DriverResponse
+public abstract class HTTPDriverResponse extends DriverResponse
{
}
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponseContext.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponseContext.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/HttpDriverResponseContext.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -32,13 +32,13 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class HttpDriverResponseContext extends RemoteDriverResponseContext
+public class HTTPDriverResponseContext extends RemoteDriverResponseContext
{
/** The http method if not null. */
private HttpMethod httpMethod;
- public HttpDriverResponseContext(HttpMethod httpMethod, DriverResponse response)
+ public HTTPDriverResponseContext(HttpMethod httpMethod, DriverResponse response)
{
super(response);
@@ -46,7 +46,7 @@
this.httpMethod = httpMethod;
}
- public HttpDriverResponseContext(DriverResponse response)
+ public HTTPDriverResponseContext(DriverResponse response)
{
this(null, response);
}
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokeGetResponse.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokeGetResponse.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokeGetResponse.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -30,7 +30,7 @@
* @author <a href="mailto:boleslaw.dawidowicz@jboss.com">Boleslaw Dawidowicz</a>
* @version $Revision: 5448 $
*/
-public class InvokeGetResponse extends HttpDriverResponse
+public class InvokeGetResponse extends HTTPDriverResponse
{
/** The serialVersionUID */
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokePostResponse.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokePostResponse.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/InvokePostResponse.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -30,7 +30,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5448 $
*/
-public class InvokePostResponse extends HttpDriverResponse
+public class InvokePostResponse extends HTTPDriverResponse
{
/** The serialVersionUID */
Modified: modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/SendResponseResponse.java
===================================================================
--- modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/SendResponseResponse.java 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/main/org/jboss/portal/test/framework/driver/http/response/SendResponseResponse.java 2007-08-22 17:14:44 UTC (rev 8033)
@@ -26,7 +26,7 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class SendResponseResponse extends HttpDriverResponse
+public class SendResponseResponse extends HTTPDriverResponse
{
public String toString()
{
Modified: modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml
===================================================================
--- modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/resources/generic/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-22 17:14:44 UTC (rev 8033)
@@ -37,7 +37,7 @@
<bean name="TestDriverServerLookup0" class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceLookup">
<constructor>
<parameter>socket://localhost:5400</parameter>
- <parameter>org.jboss.portal.test.framework.driver.http.HttpTestDriver</parameter>
+ <parameter>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</parameter>
</constructor>
</bean>
@@ -147,7 +147,7 @@
</bean>
-->
- <bean name="TestDriverClient" class="org.jboss.portal.test.framework.driver.http.HttpTestDriverClient">
+ <bean name="TestDriverClient" class="org.jboss.portal.test.framework.driver.http.HTTPTestDriverClient">
<constructor>
</constructor>
</bean>
Modified: modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml
===================================================================
--- modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/http-runner-beans.xml 2007-08-22 17:14:44 UTC (rev 8033)
@@ -50,7 +50,7 @@
<constructor>
<parameter><inject bean="MBeanServerFactory0" property="server"/></parameter>
<parameter><value>portal.test:service=TestDriverServer</value></parameter>
- <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter>
+ <parameter><value>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</value></parameter>
</constructor>
</bean>
@@ -85,7 +85,7 @@
<constructor>
<parameter><inject bean="MBeanServerFactory0" property="server"/></parameter>
<parameter><value>portal.test:service=TestDriverServer</value></parameter>
- <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter>
+ <parameter><value>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</value></parameter>
</constructor>
</bean>
@@ -120,7 +120,7 @@
<constructor>
<parameter><inject bean="MBeanServerFactory0" property="server"/></parameter>
<parameter><value>portal.test:service=TestDriverServer</value></parameter>
- <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter>
+ <parameter><value>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</value></parameter>
</constructor>
</bean>
@@ -186,7 +186,7 @@
</constructor>
</bean>
- <bean name="TestDriverClient" class="org.jboss.portal.test.framework.driver.http.HttpTestDriverClient">
+ <bean name="TestDriverClient" class="org.jboss.portal.test.framework.driver.http.HTTPTestDriverClient">
<constructor>
</constructor>
</bean>
Modified: modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml
===================================================================
--- modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml 2007-08-22 16:07:20 UTC (rev 8032)
+++ modules/test/trunk/test/src/resources/jboss/portal-test-jar/org/jboss/portal/test/framework/container/web-runner-beans.xml 2007-08-22 17:14:44 UTC (rev 8033)
@@ -50,7 +50,7 @@
<constructor>
<parameter><inject bean="MBeanServerFactory0" property="server"/></parameter>
<parameter><value>portal.test:service=TestDriverServer</value></parameter>
- <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter>
+ <parameter><value>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</value></parameter>
</constructor>
</bean>
@@ -85,7 +85,7 @@
<constructor>
<parameter><inject bean="MBeanServerFactory0" property="server"/></parameter>
<parameter><value>portal.test:service=TestDriverServer</value></parameter>
- <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter>
+ <parameter><value>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</value></parameter>
</constructor>
</bean>
@@ -120,7 +120,7 @@
<constructor>
<parameter><inject bean="MBeanServerFactory0" property="server"/></parameter>
<parameter><value>portal.test:service=TestDriverServer</value></parameter>
- <parameter><value>org.jboss.portal.test.framework.driver.http.HttpTestDriver</value></parameter>
+ <parameter><value>org.jboss.portal.test.framework.driver.http.HTTPTestDriver</value></parameter>
</constructor>
</bean>
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8032 - in modules/portlet/trunk: build and 9 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-22 12:07:20 -0400 (Wed, 22 Aug 2007)
New Revision: 8032
Added:
modules/portlet/trunk/build/ide/intellij/idea60/modules/test/
modules/portlet/trunk/build/ide/intellij/idea60/modules/test/test.iml
Modified:
modules/portlet/trunk/build/build-thirdparty.xml
modules/portlet/trunk/jboss-portal-portlet.ipr
modules/portlet/trunk/jboss-portal-portlet.iws
modules/portlet/trunk/portlet/build.xml
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java
modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java
modules/portlet/trunk/test/build.xml
modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java
modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml
modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent
Log:
update portlet module to have deployment of portlet tests
Modified: modules/portlet/trunk/build/build-thirdparty.xml
===================================================================
--- modules/portlet/trunk/build/build-thirdparty.xml 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/build/build-thirdparty.xml 2007-08-22 16:07:20 UTC (rev 8032)
@@ -52,6 +52,8 @@
<componentref name="jboss-portal/modules/test" version="1.0.0-SNAPSHOT"/>
<componentref name="sun-servlet" version="2.4"/>
+ <componentref name="jboss/remoting" version="2.2.1.GA"/>
+
<!-- Based on http://anonsvn.jboss.org/repos/jbossas/tags/EMBEDDED_JBOSS_BETA_2/build/b... -->
<componentref name="jboss/microcontainer" version="2.0.0.Beta3"/>
<componentref name="jboss/aop" version="2.0.0.alpha4"/>
Added: modules/portlet/trunk/build/ide/intellij/idea60/modules/test/test.iml
===================================================================
--- modules/portlet/trunk/build/ide/intellij/idea60/modules/test/test.iml (rev 0)
+++ modules/portlet/trunk/build/ide/intellij/idea60/modules/test/test.iml 2007-08-22 16:07:20 UTC (rev 8032)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/../../../../../../test">
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../test/src/main" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="portlet" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-container.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss/common-logging-spi/lib/jboss-logging-spi.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntryProperties />
+ </component>
+ <component name="VcsManagerConfiguration">
+ <option name="ACTIVE_VCS_NAME" value="svn" />
+ <option name="USE_PROJECT_VCS" value="false" />
+ </component>
+</module>
+
Modified: modules/portlet/trunk/jboss-portal-portlet.ipr
===================================================================
--- modules/portlet/trunk/jboss-portal-portlet.ipr 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/jboss-portal-portlet.ipr 2007-08-22 16:07:20 UTC (rev 8032)
@@ -73,15 +73,15 @@
<used_levels>
<error>
<option name="myName" value="ERROR" />
- <option name="myVal" value="200" />
+ <option name="myVal" value="400" />
</error>
<warning>
<option name="myName" value="WARNING" />
- <option name="myVal" value="100" />
+ <option name="myVal" value="300" />
</warning>
<information>
<option name="myName" value="INFO" />
- <option name="myVal" value="100" />
+ <option name="myVal" value="200" />
</information>
<server>
<option name="myName" value="SERVER PROBLEM" />
Modified: modules/portlet/trunk/jboss-portal-portlet.iws
===================================================================
--- modules/portlet/trunk/jboss-portal-portlet.iws 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-08-22 16:07:20 UTC (rev 8032)
@@ -17,7 +17,14 @@
</component>
<component name="ChangeListManager">
<list default="true" name="Default" comment="">
- <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java" afterPath="$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java" afterPath="$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/portlet/build.xml" afterPath="$PROJECT_DIR$/portlet/build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/build.xml" afterPath="$PROJECT_DIR$/test/build.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" afterPath="$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml" />
+ <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" afterPath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" />
</list>
</component>
<component name="ChangeListSynchronizer" />
@@ -89,7 +96,7 @@
</component>
<component name="DebuggerManager">
<line_breakpoints>
- <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java" line="130" class="org.jboss.portal.portlet.impl.jsr168.PortletApplicationImpl" package="org.jboss.portal.portlet.impl.jsr168">
+ <breakpoint url="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalServlet.java" line="60" class="org.jboss.portal.portlet.test.PortalServlet" package="org.jboss.portal.portlet.test">
<option name="ENABLED" value="true" />
<option name="SUSPEND_POLICY" value="SuspendAll" />
<option name="LOG_ENABLED" value="false" />
@@ -148,84 +155,33 @@
<component name="FavoritesProjectViewPane" />
<component name="FileEditorManager">
<leaf>
- <file leaf-file-name="PortletApplicationDeployment.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java">
+ <file leaf-file-name="TestDriverRegistryAccess.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="88" column="0" selection-start="4226" selection-end="4226" vertical-scroll-proportion="0.014796548">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="PortalKernelBootstrap.java" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="67" column="0" selection-start="2950" selection-end="2950" vertical-scroll-proportion="0.6004932">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="PortletApplicationImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="130" column="0" selection-start="4473" selection-end="4473" vertical-scroll-proportion="0.24660912">
+ <state line="35" column="7" selection-start="2114" selection-end="2114" vertical-scroll-proportion="0.19235511">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="PortalServlet.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalServlet.java">
+ <file leaf-file-name="PortletTestSuite.java" pinned="false" current="false" current-in-tab="false">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="13" selection-start="1991" selection-end="1991" vertical-scroll-proportion="0.13316892">
+ <state line="101" column="31" selection-start="4316" selection-end="4316" vertical-scroll-proportion="0.5437731">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="PortletApplicationDeployer.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java">
+ <file leaf-file-name="SessionTestCase.java" pinned="false" current="true" current-in-tab="true">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="13" selection-start="2913" selection-end="2913" vertical-scroll-proportion="-0.7788945">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/build.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="168" column="0" selection-start="8708" selection-end="8708" vertical-scroll-proportion="0.28853267">
+ <state line="36" column="12" selection-start="2174" selection-end="2174" vertical-scroll-proportion="0.20715167">
<folding />
</state>
</provider>
</entry>
</file>
- <file leaf-file-name="log4j.properties" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/classes/log4j.properties">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="38" selection-start="523" selection-end="523" vertical-scroll-proportion="0.13316892">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="PortletContainerImpl.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="159" column="0" selection-start="6224" selection-end="6224" vertical-scroll-proportion="0.4535176">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
</leaf>
</component>
<component name="FindManager">
@@ -473,6 +429,40 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/classes" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-portal-portlet.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/test/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -552,6 +542,10 @@
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT>
@@ -571,6 +565,154 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-portal-portlet.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="portlet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-portal-portlet.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="portlet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/classes" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-portal-portlet.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="portlet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/resources/test" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-portal-portlet.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="portlet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -639,6 +781,40 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/management" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="jboss-portal-portlet.ipr" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="portlet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet" />
+ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
<option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/deployment" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
@@ -709,15 +885,31 @@
<component name="ReadonlyStatusHandler">
<option name="SHOW_DIALOG" value="true" />
</component>
- <component name="RecentsManager" />
+ <component name="RecentsManager">
+ <key name="CopyClassDialog.RECENTS_KEY">
+ <recent name="org.jboss.portal.portlet.registry" />
+ </key>
+ </component>
<component name="RestoreUpdateTree" />
<component name="RunManager" selected="Remote.Unnamed">
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
+ <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
+ <module name="" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="PACKAGE_NAME" />
+ <option name="MAIN_CLASS_NAME" />
+ <option name="METHOD_NAME" />
+ <option name="TEST_OBJECT" value="class" />
+ <option name="VM_PARAMETERS" />
+ <option name="PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ADDITIONAL_CLASS_PATH" />
+ <option name="TEST_SEARCH_SCOPE">
+ <value defaultName="wholeProject" />
+ </option>
+ <method>
+ <option name="Make" value="true" />
+ </method>
</configuration>
<configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
<option name="MAIN_CLASS_NAME" />
@@ -729,6 +921,13 @@
<option name="ENABLE_SWING_INSPECTOR" value="false" />
<module name="" />
</configuration>
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
+ </configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -741,25 +940,6 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
- <module name="" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="PACKAGE_NAME" />
- <option name="MAIN_CLASS_NAME" />
- <option name="METHOD_NAME" />
- <option name="TEST_OBJECT" value="class" />
- <option name="VM_PARAMETERS" />
- <option name="PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ADDITIONAL_CLASS_PATH" />
- <option name="TEST_SEARCH_SCOPE">
- <value defaultName="wholeProject" />
- </option>
- <method>
- <option name="Make" value="true" />
- </method>
- </configuration>
<configuration default="false" name="Unnamed" type="Remote" factoryName="Remote">
<option name="USE_SOCKET_TRANSPORT" value="true" />
<option name="SERVER_MODE" value="false" />
@@ -840,6 +1020,7 @@
<option name="UPDATE_RECURSIVELY" value="true" />
<option name="MERGE_DRY_RUN" value="false" />
<configuration useDefault="false">/Users/julien/.subversion</configuration>
+ <upgradeMode>none</upgradeMode>
</component>
<component name="TodoView" selected-index="0">
<todo-panel id="selected-file">
@@ -866,7 +1047,7 @@
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.329859" order="0" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.329849" order="1" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.329849" order="8" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
@@ -900,7 +1081,7 @@
<option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" />
<option name="PUT_FOCUS_INTO_COMMENT" value="false" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" />
+ <option name="LAST_COMMIT_MESSAGE" value="- somehow the portal servlet can almost render portlets" />
<option name="SAVE_LAST_COMMIT_MESSAGE" value="true" />
<option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
@@ -913,6 +1094,13 @@
<option name="UPDATE_GROUP_BY_PACKAGES" value="false" />
<option name="SHOW_FILE_HISTORY_AS_TREE" value="false" />
<option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" />
+ <MESSAGE value="- wire more portlet container beans - inject kernel beans into the servlet context attributes - added tomcat logging based on jul" />
+ <MESSAGE value="fixed wrong registration logic" />
+ <MESSAGE value="added a registration flag to know when we should unregister from the registry" />
+ <MESSAGE value="leverage MC install/uninstall to update the PortletApplicationRegistry upon life cycle changes" />
+ <MESSAGE value="added few comments" />
+ <MESSAGE value="- forgot to wire the PortletContainer to the PortletApplication" />
+ <MESSAGE value="- somehow the portal servlet can almost render portlets" />
</component>
<component name="VssConfiguration">
<option name="CLIENT_PATH" value="" />
@@ -966,117 +1154,104 @@
<option name="myLastEditedConfigurable" />
</component>
<component name="editorHistoryManager">
- <entry file="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar!/org/jboss/kernel/spi/registry/KernelRegistryEntry.class">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationRegistry.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="106" selection-start="260" selection-end="260" vertical-scroll-proportion="0.05918619">
+ <state line="31" column="17" selection-start="2014" selection-end="2014" vertical-scroll-proportion="0.14796548">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/org/jboss/dependency/spi/ControllerContext.class">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/container/PortletApplication.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="17" selection-start="166" selection-end="166" vertical-scroll-proportion="0.06030151">
+ <state line="42" column="0" selection-start="1995" selection-end="2240" vertical-scroll-proportion="0.3107275">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/container/PortletApplicationContext.java">
+ <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestRenderContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="34" column="17" selection-start="2204" selection-end="2204" vertical-scroll-proportion="0.19235511">
+ <state line="39" column="56" selection-start="2383" selection-end="2383" vertical-scroll-proportion="0.1356784">
<folding />
</state>
</provider>
</entry>
- <entry file="jar://$PROJECT_DIR$/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar!/org/jboss/dependency/plugins/AbstractController.class">
+ <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/TestPortletInvocationContext.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="13" selection-start="166" selection-end="166" vertical-scroll-proportion="0.06030151">
+ <state line="66" column="75" selection-start="3157" selection-end="3157" vertical-scroll-proportion="0.50308263">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/web.xml">
+ <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent">
<provider selected="true" editor-type-id="text-editor">
- <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+ <state line="829" column="63" selection-start="31326" selection-end="31326" vertical-scroll-proportion="0.76884425">
<folding />
</state>
</provider>
</entry>
- <entry file="jar:///System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Classes/classes.jar!/com/sun/tools/javadoc/Start.class">
+ <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/modules.ent">
<provider selected="true" editor-type-id="text-editor">
- <state line="5" column="6" selection-start="152" selection-end="152" vertical-scroll-proportion="0.10786517">
+ <state line="13" column="83" selection-start="688" selection-end="720" vertical-scroll-proportion="0.19235511">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletContainerImpl.java">
+ <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="159" column="0" selection-start="6224" selection-end="6224" vertical-scroll-proportion="0.4535176">
+ <state line="21" column="0" selection-start="902" selection-end="902" vertical-scroll-proportion="0.30150753">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/classes/log4j.properties">
+ <entry file="file://$PROJECT_DIR$/portlet/src/resources/test/jsr168/api/actionrequest-war/WEB-INF/classes/logging.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="9" column="38" selection-start="523" selection-end="523" vertical-scroll-proportion="0.13316892">
+ <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/build.xml">
+ <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="168" column="0" selection-start="8708" selection-end="8708" vertical-scroll-proportion="0.28853267">
+ <state line="90" column="51" selection-start="3981" selection-end="3981" vertical-scroll-proportion="0.6118091">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml">
+ <entry file="file://$PROJECT_DIR$/portlet/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="21" column="0" selection-start="768" selection-end="768" vertical-scroll-proportion="0.3107275">
+ <state line="227" column="56" selection-start="11875" selection-end="11875" vertical-scroll-proportion="0.77681875">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletApplicationImpl.java">
+ <entry file="file://$PROJECT_DIR$/test/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="130" column="0" selection-start="4473" selection-end="4473" vertical-scroll-proportion="0.24660912">
+ <state line="162" column="93" selection-start="8435" selection-end="8435" vertical-scroll-proportion="0.30456227">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="88" column="0" selection-start="4226" selection-end="4226" vertical-scroll-proportion="0.014796548">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="35" column="7" selection-start="2114" selection-end="2114" vertical-scroll-proportion="0.19235511">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployer.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="52" column="13" selection-start="2913" selection-end="2913" vertical-scroll-proportion="-0.7788945">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
+ <state line="101" column="31" selection-start="4316" selection-end="4316" vertical-scroll-proportion="0.5437731">
+ <folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalServlet.java">
+ <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="31" column="13" selection-start="1991" selection-end="1991" vertical-scroll-proportion="0.13316892">
+ <state line="36" column="12" selection-start="2174" selection-end="2174" vertical-scroll-proportion="0.20715167">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="67" column="0" selection-start="2950" selection-end="2950" vertical-scroll-proportion="0.6004932">
- <folding>
- <element signature="imports" expanded="true" />
- </folding>
- </state>
- </provider>
- </entry>
</component>
</project>
Modified: modules/portlet/trunk/portlet/build.xml
===================================================================
--- modules/portlet/trunk/portlet/build.xml 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/portlet/build.xml 2007-08-22 16:07:20 UTC (rev 8032)
@@ -189,6 +189,9 @@
<fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/framework/**"/>
</copy>
<mkdir dir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/lib"/>
+ <copy todir="${build.resources}/test/jsr168/ext/@{test}-war/WEB-INF/lib">
+ <fileset dir="${build.lib}" includes="portal-portlet-test-framework-lib.jar"/>
+ </copy>
<jar jarfile="${build.lib}/test-jsr168-ext-(a){test}.war">
<fileset dir="${build.resources}/test/jsr168/ext/@{test}-war"/>
</jar>
@@ -204,6 +207,9 @@
<fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/framework/**"/>
</copy>
<mkdir dir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/lib"/>
+ <copy todir="${build.resources}/test/jsr168/tck/@{test}-war/WEB-INF/lib">
+ <fileset dir="${build.lib}" includes="portal-portlet-test-framework-lib.jar"/>
+ </copy>
<jar jarfile="${build.lib}/test-jsr168-(a){test}.war">
<fileset dir="${build.resources}/test/jsr168/tck/@{test}-war"/>
</jar>
@@ -219,6 +225,9 @@
<fileset dir="${build.classes}" includes="org/jboss/portal/test/portlet/framework/**"/>
</copy>
<mkdir dir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/lib"/>
+ <copy todir="${build.resources}/test/jsr168/api/@{test}-war/WEB-INF/lib">
+ <fileset dir="${build.lib}" includes="portal-portlet-test-framework-lib.jar"/>
+ </copy>
<jar jarfile="${build.lib}/test-jsr168-api-(a){test}.war">
<fileset dir="${build.resources}/test/jsr168/api/@{test}-war"/>
</jar>
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java 2007-08-22 16:07:20 UTC (rev 8032)
@@ -93,13 +93,13 @@
//
sce.getServletContext().setAttribute("SequenceRegistry", driver);
- TestDriverRegistryAccess.getInstance().getTestDriverRegistry().addDriver(driver);
+ TestDriverRegistryAccess.getTestDriverRegistry().addDriver(driver);
}
public void contextDestroyed(ServletContextEvent sce)
{
sce.getServletContext().removeAttribute("SequenceRegistry");
- TestDriverRegistryAccess.getInstance().getTestDriverRegistry().removeDriver(driver);
+ TestDriverRegistryAccess.getTestDriverRegistry().removeDriver(driver);
}
/**
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java 2007-08-22 16:07:20 UTC (rev 8032)
@@ -23,6 +23,7 @@
package org.jboss.portal.test.framework.portlet;
import org.jboss.portal.test.framework.driver.TestDriverContainer;
+import org.jboss.portal.test.framework.driver.remote.RemoteTestDriverServer;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -32,41 +33,10 @@
{
/** . */
- private static TestDriverContainer testDriverContainer;
+ private static TestDriverContainer testDriverContainer = new RemoteTestDriverServer();
- /** . */
- private static TestDriverRegistryAccess instance;
-
- public TestDriverContainer getTestDriverRegistry()
+ public static TestDriverContainer getTestDriverRegistry()
{
return testDriverContainer;
}
-
- public void setTestDriverRegistry(TestDriverContainer testDriverContainer)
- {
- this.testDriverContainer = testDriverContainer;
- }
-
- public void start() throws Exception
- {
- if (instance != null)
- {
- throw new IllegalStateException("A sequence registry already exist");
- }
- instance = this;
- }
-
- public void stop() throws Exception
- {
- instance = null;
- }
-
- public static TestDriverRegistryAccess getInstance() throws IllegalStateException
- {
- if (instance == null)
- {
- throw new IllegalStateException("No existing instance");
- }
- return instance;
- }
}
Modified: modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java
===================================================================
--- modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java 2007-08-22 16:07:20 UTC (rev 8032)
@@ -33,6 +33,9 @@
{
public SessionTestCase()
{
- super("test-ha-session.war", new NodeId[]{NodeId.PORTS_01,NodeId.PORTS_02});
+ super(new NodeId[]{NodeId.PORTS_01,NodeId.PORTS_02});
+
+ //
+ init("test-ha-session.war");
}
}
Modified: modules/portlet/trunk/test/build.xml
===================================================================
--- modules/portlet/trunk/test/build.xml 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/test/build.xml 2007-08-22 16:07:20 UTC (rev 8032)
@@ -160,11 +160,14 @@
<!-- Portlet test lib jar -->
<copy todir="${build.resources}/portlet-test-war/WEB-INF/lib">
<fileset dir="${build.lib}" includes="portlet-test-lib.jar"/>
- <fileset dir="${jboss.portal/modules/common.lib}" includes="*.jar"/>
+ <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-portal-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-generic-lib.jar"/>
<fileset dir="${jboss.portal-portlet.lib}" includes="*.jar"/>
-
+
<fileset dir="${sun.jaf.lib}" includes="*.jar"/>
+ <fileset dir="${jboss.remoting.lib}" includes="jboss-remoting.jar"/>
+
<fileset dir="${jboss.microcontainer.lib}" includes="*.jar"/>
<fileset dir="${jboss/common.core.lib}" includes="*.jar"/>
<fileset dir="${jboss/common.logging.log4j.lib}" includes="*.jar"/>
@@ -173,7 +176,7 @@
<fileset dir="${jboss.jbossxb.lib}" includes="*.jar"/>
<fileset dir="${jboss/jboss.vfs.lib}" includes="*.jar"/>
<fileset dir="${javassist.javassist.lib}" includes="*.jar"/>
- <fileset dir="${apache.log4j.lib}" includes="*.jar"/>
+ <!--<fileset dir="${apache.log4j.lib}" includes="*.jar"/>-->
<fileset dir="${apache.xerces.lib}" includes="*.jar"/>
<fileset dir="${wutka.dtdparser.lib}" includes="*.jar"/>
<fileset dir="${oswego.concurrent.lib}" includes="*.jar"/>
@@ -225,4 +228,39 @@
<!--<antcall target="test-framework"/>-->
</target>
+ <target name="bilto" depends="init">
+ <execute-tests>
+ <x-test>
+ <zest todir="${test.reports}"
+ name="org.jboss.portal.test.framework.runner.GenericHTTPTestRunner"
+ outfile="TEST-org.jboss.portal.test.portlet.info.InfoTestCase"
+ id="org.jboss.portal.test.portlet.info.InfoTestCase">
+ <parameter name="archive" value="test-jsr168-api-actionrequest.war"/>
+ </zest>
+ </x-test>
+ <x-sysproperty>
+ <sysproperty key="test.root" value="${jboss.portal-portlet.root}/lib"/>
+ <sysproperty key="test.uri" value="/test/redirect/"/>
+ </x-sysproperty>
+ <x-classpath>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.remoting.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="javassist.javassist.classpath"/>
+ <path refid="trove.trove.classpath"/>
+ <pathelement location="../tools/lib/cargo-core-uberjar-0.8.jar"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ <!--<path refid="jbossas/core.libs.classpath"/>-->
+ <pathelement location="${source.java}"/>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <pathelement location="${jboss.portal-portlet.root}/classes"/>
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ </x-classpath>
+ </execute-tests>
+ </target>
+
</project>
Modified: modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java
===================================================================
--- modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/test/src/main/org/jboss/portal/portlet/test/PortalKernelBootstrap.java 2007-08-22 16:07:20 UTC (rev 8032)
@@ -78,6 +78,23 @@
{
servletContext = event.getServletContext();
+ try
+ {
+ Class c = Thread.currentThread().getContextClassLoader().loadClass("org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter");
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ System.out.println("Loaded " + c.getName());
+ }
+ catch (ClassNotFoundException e)
+ {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
+
// For now we do it here
// System.setProperty("org.jboss.logging.Logger.pluginClass", "org.jboss.logging.log4j.Log4jLoggerPlugin");
Modified: modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml
===================================================================
--- modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/test/src/resources/portlet-test-war/WEB-INF/jboss-beans.xml 2007-08-22 16:07:20 UTC (rev 8032)
@@ -4,6 +4,27 @@
xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd"
xmlns="urn:jboss:bean-deployer:2.0">
+
+
+ <bean name="TestDriverServer" class="org.jboss.portal.test.framework.driver.remote.RemoteTestDriverServer">
+<!--
+ <depends
+ optional-attribute-name="Agent"
+ proxy-type="attribute">portal.test:service=Agent</depends>
+-->
+ </bean>
+ <bean name="TestDriverServerExporter" class="org.jboss.portal.test.framework.impl.generic.server.GenericServiceExporter">
+ <constructor>
+ <parameter>socket://localhost:5400</parameter>
+ <parameter><inject bean="TestDriverServer"/></parameter>
+ <parameter>org.jboss.portal.test.framework.driver.http.HttpTestDriver</parameter>
+ </constructor>
+ </bean>
+
+ <bean name="PortletTestDriver" class="org.jboss.portal.test.framework.portlet.TestDriverRegistryAccess">
+ <property name="testDriverRegistry"><inject bean="TestDriverServer"/></property>
+ </bean>
+
<!-- An application registry mainly for listeners -->
<bean name="PortletApplicationRegistry" class="org.jboss.portal.portlet.impl.container.PortletApplicationRegistryImpl">
</bean>
Modified: modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent
===================================================================
--- modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-08-22 16:01:32 UTC (rev 8031)
+++ modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent 2007-08-22 16:07:20 UTC (rev 8032)
@@ -685,7 +685,7 @@
jvm="${junit.jvm}">
<formatter type="plain" usefile="false"/>
<formatter
- classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+ classname="org.jboss.portal.common.junit.ant.ConfigurableXMLJUnitResultFormatter"
usefile="${junit.formatter.usefile}"
extension="${jboss-junit-configuration}.xml"/>
<sysproperty key="build.resources" value="${build.resources}"/>
@@ -696,7 +696,7 @@
<jvmarg value="${junit.jvm.options}"/>
<x-test/>
<classpath>
- <path refid="jboss.test.classpath"/>
+ <path refid="jboss.portal/modules/test.classpath"/>
<pathelement path="${driver.path}"/>
<x-classpath/>
</classpath>
18 years, 8 months
- 1
- 0
JBoss Portal SVN: r8031 - in branches/JBoss_Portal_Branch_2_6: build/ide/intellij/idea60/modules/portlet-server and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-22 12:01:32 -0400 (Wed, 22 Aug 2007)
New Revision: 8031
Modified:
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml
branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java
Log:
fix non up to date test case
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-08-22 15:48:40 UTC (rev 8030)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-08-22 16:01:32 UTC (rev 8031)
@@ -149,6 +149,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml 2007-08-22 15:48:40 UTC (rev 8030)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml 2007-08-22 16:01:32 UTC (rev 8031)
@@ -103,6 +103,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jboss-portal/modules/test/lib/portal-test-lib.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java 2007-08-22 15:48:40 UTC (rev 8030)
+++ branches/JBoss_Portal_Branch_2_6/portlet/src/main/org/jboss/portal/test/portlet/ha/session/SessionTestCase.java 2007-08-22 16:01:32 UTC (rev 8031)
@@ -33,6 +33,9 @@
{
public SessionTestCase()
{
- super("test-ha-session.war", new NodeId[]{NodeId.PORTS_01,NodeId.PORTS_02});
+ super(new NodeId[]{NodeId.PORTS_01,NodeId.PORTS_02});
+
+ //
+ init("test-ha-session.war");
}
}
18 years, 8 months
- 1
- 0