gatein SVN: r333 - in components/wci/trunk: exo and 4 other directories.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-10-12 10:58:39 -0400 (Mon, 12 Oct 2009)
New Revision: 333
Modified:
components/wci/trunk/exo/pom.xml
components/wci/trunk/jetty/pom.xml
components/wci/trunk/pom.xml
components/wci/trunk/test/pom.xml
components/wci/trunk/tomcat/pom.xml
components/wci/trunk/wci/pom.xml
Log:
[maven-release-plugin] prepare release 2.0.0-Beta02
Modified: components/wci/trunk/exo/pom.xml
===================================================================
--- components/wci/trunk/exo/pom.xml 2009-10-12 13:53:14 UTC (rev 332)
+++ components/wci/trunk/exo/pom.xml 2009-10-12 14:58:39 UTC (rev 333)
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
Modified: components/wci/trunk/jetty/pom.xml
===================================================================
--- components/wci/trunk/jetty/pom.xml 2009-10-12 13:53:14 UTC (rev 332)
+++ components/wci/trunk/jetty/pom.xml 2009-10-12 14:58:39 UTC (rev 333)
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2009-10-12 13:53:14 UTC (rev 332)
+++ components/wci/trunk/pom.xml 2009-10-12 14:58:39 UTC (rev 333)
@@ -1,6 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -8,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
<packaging>pom</packaging>
<parent>
@@ -18,9 +16,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wci/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wci/tags/2.0.0-B...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wci/tags/2.0.0-Beta02</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wci/tags/2.0.0-Beta02</url>
</scm>
<properties>
Modified: components/wci/trunk/test/pom.xml
===================================================================
--- components/wci/trunk/test/pom.xml 2009-10-12 13:53:14 UTC (rev 332)
+++ components/wci/trunk/test/pom.xml 2009-10-12 14:58:39 UTC (rev 333)
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test</artifactId>
@@ -225,56 +224,56 @@
<configuration>
<tasks>
- <property name="compile_classpath" refid="maven.compile.classpath"/>
- <property name="runtime_classpath" refid="maven.runtime.classpath"/>
- <property name="test_classpath" refid="maven.test.classpath"/>
- <property name="plugin_classpath" refid="maven.plugin.classpath"/>
- <property name="project.version" value="${project.version}"/>
+ <property name="compile_classpath" refid="maven.compile.classpath" />
+ <property name="runtime_classpath" refid="maven.runtime.classpath" />
+ <property name="test_classpath" refid="maven.test.classpath" />
+ <property name="plugin_classpath" refid="maven.plugin.classpath" />
+ <property name="project.version" value="${project.version}" />
<!-- -->
- <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}"/>
- <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}"/>
- <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}"/>
- <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}"/>
- <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}"/>
- <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}"/>
+ <property name="dependency.log4j.jar" value="${maven.dependency.apache-log4j.log4j.jar.path}" />
+ <property name="dependency.commons-logging.jar" value="${maven.dependency.commons-logging.commons-logging.jar.path}" />
+ <property name="dependency.commons-httpclient.jar" value="${maven.dependency.commons-httpclient.commons-httpclient.jar.path}" />
+ <property name="dependency.activation.jar" value="${maven.dependency.javax.activation.activation.jar.path}" />
+ <property name="dependency.junit.jar" value="${maven.dependency.junit.junit.jar.path}" />
+ <property name="dependency.cargo-manager.war" value="${maven.dependency.cargo.cargo-manager.war.path}" />
<!-- GateIn -->
- <property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
- <property name="dependency.gatein-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
- <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat.jar.path}"/>
+ <property name="dependency.gatein-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}" />
+ <property name="dependency.gatein-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}" />
+ <property name="dependency.gatein-wci-core.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}" />
+ <property name="dependency.gatein-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat.jar.path}" />
<!-- JBoss Unit -->
- <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
- <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}"/>
- <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}"/>
- <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}"/>
- <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}"/>
- <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}"/>
+ <property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}" />
+ <property name="dependency.jboss-unit-mc.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-mc.jar.path}" />
+ <property name="dependency.jboss-unit-remote.jar" value="${maven.dependency.org.jboss.unit.jboss-unit-remote.jar.path}" />
+ <property name="dependency.portal-test.jar" value="${maven.dependency.org.jboss.unit.portal-test.jar.path}" />
+ <property name="dependency.portal-test-generic.jar" value="${maven.dependency.org.jboss.unit.portal-test-generic.jar.path}" />
+ <property name="dependency.jboss-remoting.jar" value="${maven.dependency.org.jboss.remoting.jboss-remoting.jar.path}" />
<!-- JBoss Microcontainer -->
- <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}"/>
- <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}"/>
- <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}"/>
- <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}"/>
- <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}"/>
- <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}"/>
- <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}"/>
- <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}"/>
- <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}"/>
- <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}"/>
- <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}"/>
- <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}"/>
- <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
- <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
- <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}"/>
+ <property name="dependency.concurrent.jar" value="${maven.dependency.concurrent.concurrent.jar.path}" />
+ <property name="dependency.jboss-logging-spi.jar" value="${maven.dependency.jboss.jboss-common-logging-spi.jar.path}" />
+ <property name="dependency.jboss-logging-jdk.jar" value="${maven.dependency.jboss.jboss-common-logging-jdk.jar.path}" />
+ <property name="dependency.jboss-logging-log4j.jar" value="${maven.dependency.jboss.jboss-common-logging-log4j.jar.path}" />
+ <property name="dependency.jboss-kernel.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-kernel.jar.path}" />
+ <property name="dependency.jboss-dependency.jar" value="${maven.dependency.org.jboss.microcontainer.jboss-dependency.jar.path}" />
+ <property name="dependency.jboss-reflect.jar" value="${maven.dependency.org.jboss.jboss-reflect.jar.path}" />
+ <property name="dependency.jboss-common-core.jar" value="${maven.dependency.org.jboss.jboss-common-core.jar.path}" />
+ <property name="dependency.jaxb.jar" value="${maven.dependency.javax.xml.bind.jaxb-api.jar.path}" />
+ <property name="dependency.jboss-mdr.jar" value="${maven.dependency.org.jboss.jboss-mdr.jar.path}" />
+ <property name="dependency.resolver.jar" value="${maven.dependency.apache-xerces.resolver.jar.path}" />
+ <property name="dependency.xercesImpl.jar" value="${maven.dependency.apache-xerces.xercesImpl.jar.path}" />
+ <property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}" />
+ <property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}" />
+ <property name="dependency.jboss-serialization.jar" value="${maven.dependency.jboss.jboss-serialization.jar.path}" />
<!-- Cargo Jetty deployer -->
- <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/>
+ <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}" />
<ant antfile="${basedir}/src/test/build.xml">
- <target name="tests"/>
+ <target name="tests" />
</ant>
</tasks>
Modified: components/wci/trunk/tomcat/pom.xml
===================================================================
--- components/wci/trunk/tomcat/pom.xml 2009-10-12 13:53:14 UTC (rev 332)
+++ components/wci/trunk/tomcat/pom.xml 2009-10-12 14:58:39 UTC (rev 333)
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
Modified: components/wci/trunk/wci/pom.xml
===================================================================
--- components/wci/trunk/wci/pom.xml 2009-10-12 13:53:14 UTC (rev 332)
+++ components/wci/trunk/wci/pom.xml 2009-10-12 14:58:39 UTC (rev 333)
@@ -1,9 +1,8 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.0.0-SNAPSHOT</version>
+ <version>2.0.0-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
15 years, 3 months
gatein SVN: r332 - components/wci/trunk.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-10-12 09:53:14 -0400 (Mon, 12 Oct 2009)
New Revision: 332
Modified:
components/wci/trunk/pom.xml
Log:
typo
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2009-10-12 13:48:09 UTC (rev 331)
+++ components/wci/trunk/pom.xml 2009-10-12 13:53:14 UTC (rev 332)
@@ -36,7 +36,7 @@
<!-- used in test module by maven-antrun-extended-plugin -->
<version.jboss.unit>1.2.3</version.jboss.unit>
- <version.cargo>1.0.1-alpha1</version.cargo>
+ <version.cargo>1.0.1-alpha-1</version.cargo>
</properties>
15 years, 3 months
gatein SVN: r331 - components/wci/trunk.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-10-12 09:48:09 -0400 (Mon, 12 Oct 2009)
New Revision: 331
Modified:
components/wci/trunk/pom.xml
Log:
JBoss Unit and cargo versions cannot be removed
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2009-10-12 13:35:04 UTC (rev 330)
+++ components/wci/trunk/pom.xml 2009-10-12 13:48:09 UTC (rev 331)
@@ -33,6 +33,11 @@
<version.saxpath>1.0-FCS</version.saxpath>
<version.apache.commons-logging>1.1.0.jboss</version.apache.commons-logging>
+
+ <!-- used in test module by maven-antrun-extended-plugin -->
+ <version.jboss.unit>1.2.3</version.jboss.unit>
+ <version.cargo>1.0.1-alpha1</version.cargo>
+
</properties>
<dependencyManagement>
15 years, 3 months
gatein SVN: r330 - components/wci/trunk.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-10-12 09:35:04 -0400 (Mon, 12 Oct 2009)
New Revision: 330
Modified:
components/wci/trunk/pom.xml
Log:
Removed dependencies defined by gatein-dep. Updated common version
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2009-10-12 12:59:41 UTC (rev 329)
+++ components/wci/trunk/pom.xml 2009-10-12 13:35:04 UTC (rev 330)
@@ -24,7 +24,7 @@
</scm>
<properties>
- <version.gatein.common>2.0.0-Beta02</version.gatein.common>
+ <version.gatein.common>2.0.0-Beta03</version.gatein.common>
<version.junit>3.8.2-brew</version.junit>
<version.jaxb>2.1</version.jaxb>
@@ -33,10 +33,6 @@
<version.saxpath>1.0-FCS</version.saxpath>
<version.apache.commons-logging>1.1.0.jboss</version.apache.commons-logging>
-
- <!-- used in test module by maven-antrun-extended-plugin -->
- <version.jboss.unit>1.2.2</version.jboss.unit>
- <version.cargo>1.0.1-SNAPSHOT</version.cargo>
</properties>
<dependencyManagement>
15 years, 3 months
gatein SVN: r329 - components/pc/trunk/federation/src/test/java/org/gatein/pc/federation.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-10-12 08:59:41 -0400 (Mon, 12 Oct 2009)
New Revision: 329
Modified:
components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java
Log:
- Fixed tests: wrong setup and wrong expectations.
Modified: components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java
===================================================================
--- components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java 2009-10-12 11:42:03 UTC (rev 328)
+++ components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java 2009-10-12 12:59:41 UTC (rev 329)
@@ -51,10 +51,12 @@
/** . */
private FederatingPortletInvoker federatingInvoker;
- /** . */
- private PortletInvokerSupport federatedInvoker;
- private PortletInvokerSupport localInvoker;
+ private FederatedPortletInvoker federatedInvoker;
+ private PortletInvokerSupport federatedInvokerDelegate;
+ private FederatedPortletInvoker localInvoker;
+ private PortletInvokerSupport localInvokerDelegate;
+
/** . */
private Portlet portlet;
@@ -66,23 +68,24 @@
{
federatingInvoker = new FederatingPortletInvokerService();
- // Invokers
- federatedInvoker = new PortletInvokerSupport();
- localInvoker = new PortletInvokerSupport();
-
- // Add portlets to invokers
+ // create 'foo' invoker and register it with federating service
+ federatedInvokerDelegate = new PortletInvokerSupport();
PortletInfoSupport fooInfo = new PortletInfoSupport();
fooInfo.getMeta().setDisplayName("FooPortlet");
- portlet = federatedInvoker.addPortlet("MyPortlet", fooInfo);
+ portlet = federatedInvokerDelegate.addPortlet("MyPortlet", fooInfo);
portletContext = portlet.getContext();
+ federatedInvoker = federatingInvoker.registerInvoker("foo", federatedInvokerDelegate);
+ assertNotNull(federatedInvoker);
+ assertEquals("foo", federatedInvoker.getId());
+ // create 'local' invoker and register it with federating service
+ localInvokerDelegate = new PortletInvokerSupport();
PortletInfoSupport localInfo = new PortletInfoSupport();
- fooInfo.getMeta().setDisplayName("LocalPortlet");
- localInvoker.addPortlet("MyLocalPortlet", localInfo);
-
- // Register invokers with federating service
- federatingInvoker.registerInvoker("foo", federatedInvoker);
- federatingInvoker.registerInvoker(PortletInvoker.LOCAL_PORTLET_INVOKER_ID, localInvoker);
+ localInfo.getMeta().setDisplayName("LocalPortlet");
+ localInvokerDelegate.addPortlet("MyLocalPortlet", localInfo);
+ localInvoker = federatingInvoker.registerInvoker(PortletInvoker.LOCAL_PORTLET_INVOKER_ID, localInvokerDelegate);
+ assertNotNull(localInvoker);
+ assertEquals(PortletInvoker.LOCAL_PORTLET_INVOKER_ID, localInvoker.getId());
}
@Destroy
@@ -106,7 +109,7 @@
{
PortletContext context = portlet.getContext();
String id = context.getId();
- assertTrue("MyPortlet".equals(id) || "MyLocalPortlet".equals(id));
+ assertTrue("foo.MyPortlet".equals(id) || (PortletInvoker.LOCAL_PORTLET_INVOKER_ID + ".MyLocalPortlet").equals(id));
}
}
@@ -120,12 +123,14 @@
FederatedPortletInvoker federated = federatingInvoker.getFederatedInvoker("foo");
assertNotNull(federated);
assertEquals("foo", federated.getId());
- assertEquals(federatedInvoker, federated.getPortletInvoker());
+ assertEquals(federatedInvoker, federated);
+ assertEquals(federatedInvokerDelegate, federated.getPortletInvoker());
federated = federatingInvoker.getFederatedInvoker(PortletInvoker.LOCAL_PORTLET_INVOKER_ID);
assertNotNull(federated);
assertEquals(PortletInvoker.LOCAL_PORTLET_INVOKER_ID, federated.getId());
- assertEquals(localInvoker, federated.getPortletInvoker());
+ assertEquals(localInvoker, federated);
+ assertEquals(localInvokerDelegate, federated.getPortletInvoker());
}
@Test
@@ -142,11 +147,26 @@
}
@Test
- public void testGetPortlet() throws PortletInvokerException
+ public void testGetPortletNonFederatedContext() throws PortletInvokerException
{
- Portlet samePortlet = federatingInvoker.getPortlet(portletContext);
+ try
+ {
+ federatingInvoker.getPortlet(portletContext);
+ fail("Non federated context shouldn't be resolved by federating service");
+ }
+ catch (IllegalArgumentException e)
+ {
+ // expected
+ }
+ }
+
+ @Test
+ public void testGetPortletOnFederatedInvoker() throws PortletInvokerException
+ {
+ PortletContext federatedContext = PortletContext.createPortletContext(federatedInvoker.getId() + "." + portletContext.getId());
+ Portlet samePortlet = federatedInvoker.getPortlet(federatedContext);
assertNotNull(samePortlet);
- assertEquals(samePortlet.getContext(), portletContext);
+ assertEquals(samePortlet.getContext(), federatedContext);
}
@Test
@@ -156,7 +176,7 @@
assertEquals(1, localPortlets.size());
Portlet localPortlet = localPortlets.iterator().next();
assertNotNull(localPortlet);
- assertEquals("MyLocalPortlet", localPortlet.getContext().getId());
+ assertEquals("local.MyLocalPortlet", localPortlet.getContext().getId());
}
@Test
@@ -166,10 +186,6 @@
assertEquals(1, portlets.size());
Portlet portlet = portlets.iterator().next();
assertNotNull(portlet);
- assertEquals("MyPortlet", portlet.getContext().getId());
+ assertEquals("foo.MyPortlet", portlet.getContext().getId());
}
-
- public void testInvoke() throws PortletInvokerException
- {
- }
}
15 years, 3 months
gatein SVN: r328 - components/pc/trunk/test/src/test.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-10-12 07:42:03 -0400 (Mon, 12 Oct 2009)
New Revision: 328
Modified:
components/pc/trunk/test/src/test/build.xml
Log:
formatting
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-10-12 11:38:31 UTC (rev 327)
+++ components/pc/trunk/test/src/test/build.xml 2009-10-12 11:42:03 UTC (rev 328)
@@ -735,7 +735,7 @@
</sharedClasspath>
<configuration home="${test.jboss-5.1.tempdir}">
- <property name="cargo.timeout" value="240000"/>
+ <property name="cargo.timeout" value="240000"/>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<property name="cargo.rmi.port" value="1099"/>
15 years, 3 months
gatein SVN: r327 - components/pc/trunk/test/src/test.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-10-12 07:38:31 -0400 (Mon, 12 Oct 2009)
New Revision: 327
Modified:
components/pc/trunk/test/src/test/build.xml
Log:
Increased cargo timeout for AS 5
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-10-09 13:55:34 UTC (rev 326)
+++ components/pc/trunk/test/src/test/build.xml 2009-10-12 11:38:31 UTC (rev 327)
@@ -735,6 +735,7 @@
</sharedClasspath>
<configuration home="${test.jboss-5.1.tempdir}">
+ <property name="cargo.timeout" value="240000"/>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<property name="cargo.rmi.port" value="1099"/>
15 years, 3 months
gatein SVN: r326 - components/wsrp/trunk.
by do-not-reply@jboss.org
Author: aheritier
Date: 2009-10-09 09:55:34 -0400 (Fri, 09 Oct 2009)
New Revision: 326
Modified:
components/wsrp/trunk/pom.xml
Log:
Upgrade to org.gatein:gatein-parent:1.0.0-Beta02
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2009-10-09 13:51:33 UTC (rev 325)
+++ components/wsrp/trunk/pom.xml 2009-10-09 13:55:34 UTC (rev 326)
@@ -38,7 +38,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02</version>
</parent>
<scm>
15 years, 3 months
gatein SVN: r325 - components/wci/trunk.
by do-not-reply@jboss.org
Author: aheritier
Date: 2009-10-09 09:51:33 -0400 (Fri, 09 Oct 2009)
New Revision: 325
Modified:
components/wci/trunk/
components/wci/trunk/pom.xml
Log:
Upgrade to org.gatein:gatein-parent:1.0.0-Beta02
Property changes on: components/wci/trunk
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
.project
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2009-10-09 13:49:27 UTC (rev 324)
+++ components/wci/trunk/pom.xml 2009-10-09 13:51:33 UTC (rev 325)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02</version>
</parent>
<scm>
15 years, 3 months
gatein SVN: r324 - components/pc/trunk.
by do-not-reply@jboss.org
Author: aheritier
Date: 2009-10-09 09:49:27 -0400 (Fri, 09 Oct 2009)
New Revision: 324
Modified:
components/pc/trunk/
components/pc/trunk/pom.xml
Log:
Upgrade to org.gatein:gatein-parent:1.0.0-Beta02
Property changes on: components/pc/trunk
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
.project
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2009-10-09 13:48:52 UTC (rev 323)
+++ components/pc/trunk/pom.xml 2009-10-09 13:49:27 UTC (rev 324)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02</version>
</parent>
<scm>
15 years, 3 months