gatein SVN: r6149 - components/wci/trunk.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-03-31 10:49:46 -0400 (Thu, 31 Mar 2011)
New Revision: 6149
Modified:
components/wci/trunk/pom.xml
Log:
Fix test failure issue when using Tomcat 7 greater than 7.0.6. Can be reverted when the next version of Cargo properly fixes the issue.
Modified: components/wci/trunk/pom.xml
===================================================================
--- components/wci/trunk/pom.xml 2011-03-31 14:24:30 UTC (rev 6148)
+++ components/wci/trunk/pom.xml 2011-03-31 14:49:46 UTC (rev 6149)
@@ -32,7 +32,7 @@
<version.saxpath>1.0-FCS</version.saxpath>
<version.discovery>0.4</version.discovery>
<!-- used in test module by maven-antrun-extended-plugin -->
- <version.cargo>1.0.3</version.cargo>
+ <version.cargo>1.0.6</version.cargo>
<version.cargo.jetty.deployer>1.0.1</version.cargo.jetty.deployer>
<version.oswego.concurrent>1.3.4</version.oswego.concurrent>
13 years, 9 months
- 1
- 0
gatein SVN: r6146 - components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-03-30 16:58:26 -0400 (Wed, 30 Mar 2011)
New Revision: 6146
Modified:
components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java
Log:
GTNPORTAL-1845: allow the credentials to be always available in the session. This way we can use the http session to retrieve the actual username and password.
Modified: components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java
===================================================================
--- components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java 2011-03-30 15:21:05 UTC (rev 6145)
+++ components/wci/trunk/wci/src/main/java/org/gatein/wci/authentication/GenericAuthentication.java 2011-03-30 20:58:26 UTC (rev 6146)
@@ -42,8 +42,6 @@
{
String ticket = TICKET_SERVICE.createTicket(new Credentials(credentials.getUsername(), credentials.getPassword()), validityMillis);
- request.getSession().removeAttribute(Credentials.CREDENTIALS);
-
if (initialURI == null) {
initialURI = request.getRequestURI();
}
13 years, 9 months
- 1
- 0
gatein SVN: r6145 - in epp/portal/branches/EPP_5_1_Branch: component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-30 11:21:05 -0400 (Wed, 30 Mar 2011)
New Revision: 6145
Modified:
epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
- GTNWSRP-216: Updated JCRRegistrationPersistenceManager to account for changes in API.
- Upgraded to WSRP 2.0.1-Beta02.
Modified: epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2011-03-30 15:00:56 UTC (rev 6144)
+++ epp/portal/branches/EPP_5_1_Branch/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2011-03-30 15:21:05 UTC (rev 6145)
@@ -97,7 +97,7 @@
}
@Override
- protected RegistrationSPI internalRemoveRegistration(String registrationId)
+ protected RegistrationSPI internalRemoveRegistration(String registrationId) throws RegistrationException
{
Registration registration = getRegistration(registrationId);
remove(registration.getPersistentKey(), RegistrationMapping.class);
@@ -106,7 +106,7 @@
}
@Override
- protected RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map registrationProperties)
+ protected RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map registrationProperties) throws RegistrationException
{
ChromatticSession session = persister.getSession();
RegistrationSPI registration = null;
@@ -120,15 +120,15 @@
}
catch (Exception e)
{
- e.printStackTrace(); // todo fix me
persister.closeSession(false);
+ throw new RegistrationException(e);
}
return registration;
}
@Override
- protected ConsumerSPI internalRemoveConsumer(String consumerId)
+ protected ConsumerSPI internalRemoveConsumer(String consumerId) throws RegistrationException
{
remove(consumerId, ConsumerMapping.class);
@@ -143,7 +143,7 @@
}
@Override
- protected ConsumerSPI internalCreateConsumer(String consumerId, String consumerName)
+ protected ConsumerSPI internalCreateConsumer(String consumerId, String consumerName) throws RegistrationException
{
ConsumerSPI consumer = super.internalCreateConsumer(consumerId, consumerName);
@@ -159,15 +159,15 @@
}
catch (Exception e)
{
- e.printStackTrace(); // todo: fix me
persister.closeSession(false);
+ throw new RegistrationException(e);
}
return consumer;
}
@Override
- protected ConsumerSPI internalSaveChangesTo(Consumer consumer)
+ protected ConsumerSPI internalSaveChangesTo(Consumer consumer) throws RegistrationException
{
ConsumerSPI consumerSPI = super.internalSaveChangesTo(consumer);
@@ -180,14 +180,14 @@
}
catch (Exception e)
{
- e.printStackTrace(); // todo: fix me
persister.closeSession(false);
+ throw new RegistrationException(e);
}
return consumerSPI;
}
- protected RegistrationSPI internalSaveChangesTo(Registration registration)
+ protected RegistrationSPI internalSaveChangesTo(Registration registration) throws RegistrationException
{
RegistrationSPI registrationSPI = super.internalSaveChangesTo(registration);
@@ -200,15 +200,15 @@
}
catch (Exception e)
{
- e.printStackTrace(); //todo: fix me
persister.closeSession(false);
+ throw new RegistrationException(e);
}
return registrationSPI;
}
@Override
- protected ConsumerGroupSPI internalRemoveConsumerGroup(String name)
+ protected ConsumerGroupSPI internalRemoveConsumerGroup(String name) throws RegistrationException
{
try
{
@@ -224,7 +224,7 @@
}
@Override
- protected ConsumerGroupSPI internalCreateConsumerGroup(String name)
+ protected ConsumerGroupSPI internalCreateConsumerGroup(String name) throws RegistrationException
{
ConsumerGroupSPI group = super.internalCreateConsumerGroup(name);
@@ -239,8 +239,8 @@
}
catch (Exception e)
{
- e.printStackTrace(); // todo: fix me
persister.closeSession(false);
+ throw new RegistrationException(e);
}
return group;
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-03-30 15:00:56 UTC (rev 6144)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-03-30 15:21:05 UTC (rev 6145)
@@ -48,7 +48,7 @@
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.2.0-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.8.CR01</org.picketlink.idm>
- <org.gatein.wsrp.version>2.0.1-Beta01</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.0.1-Beta02</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
13 years, 9 months
- 1
- 0
gatein SVN: r6144 - in components/wsrp/branches/2.0.x: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-30 11:00:56 -0400 (Wed, 30 Mar 2011)
New Revision: 6144
Modified:
components/wsrp/branches/2.0.x/admin-gui/pom.xml
components/wsrp/branches/2.0.x/api/pom.xml
components/wsrp/branches/2.0.x/common/pom.xml
components/wsrp/branches/2.0.x/consumer/pom.xml
components/wsrp/branches/2.0.x/hibernate-impl/pom.xml
components/wsrp/branches/2.0.x/pom.xml
components/wsrp/branches/2.0.x/producer/pom.xml
components/wsrp/branches/2.0.x/test/pom.xml
components/wsrp/branches/2.0.x/wsrp-producer-war/pom.xml
components/wsrp/branches/2.0.x/wsrp1-ws/pom.xml
components/wsrp/branches/2.0.x/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wsrp/branches/2.0.x/admin-gui/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/admin-gui/pom.xml 2011-03-30 15:00:35 UTC (rev 6143)
+++ components/wsrp/branches/2.0.x/admin-gui/pom.xml 2011-03-30 15:00:56 UTC (rev 6144)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02</version>
+ <version>2.0.1-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/branches/2.0.x/api/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/api/pom.xml 2011-03-30 15:00:35 UTC (rev 6143)
+++ components/wsrp/branches/2.0.x/api/pom.xml 2011-03-30 15:00:56 UTC (rev 6144)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02</version>
+ <version>2.0.1-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/branches/2.0.x/common/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/common/pom.xml 2011-03-30 15:00:35 UTC (rev 6143)
+++ components/wsrp/branches/2.0.x/common/pom.xml 2011-03-30 15:00:56 UTC (rev 6144)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02</version>
+ <version>2.0.1-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/branches/2.0.x/consumer/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/consumer/pom.xml 2011-03-30 15:00:35 UTC (rev 6143)
+++ components/wsrp/branches/2.0.x/consumer/pom.xml 2011-03-30 15:00:56 UTC (rev 6144)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02</version>
+ <version>2.0.1-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/branches/2.0.x/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/hibernate-impl/pom.xml 2011-03-30 15:00:35 UTC (rev 6143)
+++ components/wsrp/branches/2.0.x/hibernate-impl/pom.xml 2011-03-30 15:00:56 UTC (rev 6144)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02</version>
+ <version>2.0.1-Beta03-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/branches/2.0.x/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/pom.xml 2011-03-30 15:00:35 UTC (rev 6143)
+++ components/wsrp/branches/2.0.x/pom.xml 2011-03-30 15:00:56 UTC (rev 6144)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02</version>
+ <version>2.0.1-Beta03-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,10 +40,10 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.1-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.1-Beta02
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/branches/2....</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/branches/2.0.x/
</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.1-Beta02</url>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/branches/2.0.x/</url>
</scm>
<properties>
Modified: components/wsrp/branches/2.0.x/producer/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/producer/pom.xml 2011-03-30 15:00:35 UTC (rev 6143)
+++ components/wsrp/branches/2.0.x/producer/pom.xml 2011-03-30 15:00:56 UTC (rev 6144)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02</version>
+ <version>2.0.1-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/branches/2.0.x/test/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/test/pom.xml 2011-03-30 15:00:35 UTC (rev 6143)
+++ components/wsrp/branches/2.0.x/test/pom.xml 2011-03-30 15:00:56 UTC (rev 6144)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02</version>
+ <version>2.0.1-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.0.x/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/wsrp-producer-war/pom.xml 2011-03-30 15:00:35 UTC (rev 6143)
+++ components/wsrp/branches/2.0.x/wsrp-producer-war/pom.xml 2011-03-30 15:00:56 UTC (rev 6144)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02</version>
+ <version>2.0.1-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.0.x/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/wsrp1-ws/pom.xml 2011-03-30 15:00:35 UTC (rev 6143)
+++ components/wsrp/branches/2.0.x/wsrp1-ws/pom.xml 2011-03-30 15:00:56 UTC (rev 6144)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02</version>
+ <version>2.0.1-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/branches/2.0.x/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/wsrp2-ws/pom.xml 2011-03-30 15:00:35 UTC (rev 6143)
+++ components/wsrp/branches/2.0.x/wsrp2-ws/pom.xml 2011-03-30 15:00:56 UTC (rev 6144)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.1-Beta02</version>
+ <version>2.0.1-Beta03-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 9 months
- 1
- 0
gatein SVN: r6143 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-30 11:00:35 -0400 (Wed, 30 Mar 2011)
New Revision: 6143
Added:
components/wsrp/tags/2.0.1-Beta02/
Log:
[maven-scm] copy for tag 2.0.1-Beta02
13 years, 9 months
- 1
- 0
gatein SVN: r6142 - in components/wsrp/branches/2.0.x: admin-gui and 9 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-30 11:00:08 -0400 (Wed, 30 Mar 2011)
New Revision: 6142
Modified:
components/wsrp/branches/2.0.x/admin-gui/pom.xml
components/wsrp/branches/2.0.x/api/pom.xml
components/wsrp/branches/2.0.x/common/pom.xml
components/wsrp/branches/2.0.x/consumer/pom.xml
components/wsrp/branches/2.0.x/hibernate-impl/pom.xml
components/wsrp/branches/2.0.x/pom.xml
components/wsrp/branches/2.0.x/producer/pom.xml
components/wsrp/branches/2.0.x/test/pom.xml
components/wsrp/branches/2.0.x/wsrp-producer-war/pom.xml
components/wsrp/branches/2.0.x/wsrp1-ws/pom.xml
components/wsrp/branches/2.0.x/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare release 2.0.1-Beta02
Modified: components/wsrp/branches/2.0.x/admin-gui/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/admin-gui/pom.xml 2011-03-30 14:55:57 UTC (rev 6141)
+++ components/wsrp/branches/2.0.x/admin-gui/pom.xml 2011-03-30 15:00:08 UTC (rev 6142)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02-SNAPSHOT</version>
+ <version>2.0.1-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/branches/2.0.x/api/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/api/pom.xml 2011-03-30 14:55:57 UTC (rev 6141)
+++ components/wsrp/branches/2.0.x/api/pom.xml 2011-03-30 15:00:08 UTC (rev 6142)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02-SNAPSHOT</version>
+ <version>2.0.1-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/branches/2.0.x/common/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/common/pom.xml 2011-03-30 14:55:57 UTC (rev 6141)
+++ components/wsrp/branches/2.0.x/common/pom.xml 2011-03-30 15:00:08 UTC (rev 6142)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02-SNAPSHOT</version>
+ <version>2.0.1-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/branches/2.0.x/consumer/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/consumer/pom.xml 2011-03-30 14:55:57 UTC (rev 6141)
+++ components/wsrp/branches/2.0.x/consumer/pom.xml 2011-03-30 15:00:08 UTC (rev 6142)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02-SNAPSHOT</version>
+ <version>2.0.1-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/branches/2.0.x/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/hibernate-impl/pom.xml 2011-03-30 14:55:57 UTC (rev 6141)
+++ components/wsrp/branches/2.0.x/hibernate-impl/pom.xml 2011-03-30 15:00:08 UTC (rev 6142)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02-SNAPSHOT</version>
+ <version>2.0.1-Beta02</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/branches/2.0.x/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/pom.xml 2011-03-30 14:55:57 UTC (rev 6141)
+++ components/wsrp/branches/2.0.x/pom.xml 2011-03-30 15:00:08 UTC (rev 6142)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02-SNAPSHOT</version>
+ <version>2.0.1-Beta02</version>
<packaging>pom</packaging>
@@ -40,10 +40,10 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/branches/2....</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/branches/2.0.x/
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.0.1-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.0.1-Beta02
</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/branches/2.0.x/</url>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.0.1-Beta02</url>
</scm>
<properties>
Modified: components/wsrp/branches/2.0.x/producer/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/producer/pom.xml 2011-03-30 14:55:57 UTC (rev 6141)
+++ components/wsrp/branches/2.0.x/producer/pom.xml 2011-03-30 15:00:08 UTC (rev 6142)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02-SNAPSHOT</version>
+ <version>2.0.1-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/branches/2.0.x/test/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/test/pom.xml 2011-03-30 14:55:57 UTC (rev 6141)
+++ components/wsrp/branches/2.0.x/test/pom.xml 2011-03-30 15:00:08 UTC (rev 6142)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02-SNAPSHOT</version>
+ <version>2.0.1-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.0.x/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/wsrp-producer-war/pom.xml 2011-03-30 14:55:57 UTC (rev 6141)
+++ components/wsrp/branches/2.0.x/wsrp-producer-war/pom.xml 2011-03-30 15:00:08 UTC (rev 6142)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02-SNAPSHOT</version>
+ <version>2.0.1-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/branches/2.0.x/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/wsrp1-ws/pom.xml 2011-03-30 14:55:57 UTC (rev 6141)
+++ components/wsrp/branches/2.0.x/wsrp1-ws/pom.xml 2011-03-30 15:00:08 UTC (rev 6142)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.0.1-Beta02-SNAPSHOT</version>
+ <version>2.0.1-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/branches/2.0.x/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/branches/2.0.x/wsrp2-ws/pom.xml 2011-03-30 14:55:57 UTC (rev 6141)
+++ components/wsrp/branches/2.0.x/wsrp2-ws/pom.xml 2011-03-30 15:00:08 UTC (rev 6142)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.0.1-Beta02-SNAPSHOT</version>
+ <version>2.0.1-Beta02</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 9 months
- 1
- 0
gatein SVN: r6141 - in components/wsrp/branches/2.0.x: admin-gui/src/main/webapp/WEB-INF/classes and 3 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-03-30 10:55:57 -0400 (Wed, 30 Mar 2011)
New Revision: 6141
Modified:
components/wsrp/branches/2.0.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties
components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java
components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/RegistrationHandler.java
Log:
- GTNWSRP-216: Do not swallow persistence layer exceptions anymore.
Modified: components/wsrp/branches/2.0.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java
===================================================================
--- components/wsrp/branches/2.0.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2011-03-30 14:47:40 UTC (rev 6140)
+++ components/wsrp/branches/2.0.x/admin-gui/src/main/java/org/gatein/wsrp/admin/ui/ConsumerBean.java 2011-03-30 14:55:57 UTC (rev 6141)
@@ -642,11 +642,23 @@
}
}
- beanContext.createLocalizedMessage(BeanContext.STATUS, IMPORT_SUCCESS, beanContext.getInfoSeverity(), importCount);
+ // only display success message if we have imported at least one portlet successfully
+ if (importCount > 0)
+ {
+ beanContext.createLocalizedMessage(BeanContext.STATUS, IMPORT_SUCCESS, beanContext.getInfoSeverity(), importCount);
+ }
+
SortedMap<QName, List<String>> errorCodesToFailedPortletHandlesMapping = info.getErrorCodesToFailedPortletHandlesMapping();
if (!errorCodesToFailedPortletHandlesMapping.isEmpty())
{
- beanContext.createErrorMessage(FAILED_PORTLETS, errorCodesToFailedPortletHandlesMapping);
+ for (Map.Entry<QName, List<String>> entry : errorCodesToFailedPortletHandlesMapping.entrySet())
+ {
+ QName errorCode = entry.getKey();
+ for (String handle : entry.getValue())
+ {
+ beanContext.createErrorMessage(FAILED_PORTLETS, handle + " (cause: " + errorCode + ")");
+ }
+ }
}
return ConsumerManagerBean.CONSUMERS;
@@ -656,7 +668,6 @@
beanContext.createErrorMessageFrom(e);
return null;
}
-
}
public String deleteExport()
Modified: components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties
===================================================================
--- components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2011-03-30 14:47:40 UTC (rev 6140)
+++ components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource.properties 2011-03-30 14:55:57 UTC (rev 6141)
@@ -188,7 +188,7 @@
bean_consumer_malformed_url = ''{0}'' is not a valid URL: {1}
bean_consumer_update_success = Successfully updated consumer!
bean_consumer_import_success = {0} portlets were successfully imported!
-bean_consumer_import_failed_portlets = The following portlets couldn't be imported: {0}
+bean_consumer_import_failed_portlets = The following portlet couldn''t be imported: {0}
# ConsumerManagerBean
bean_consumermanager_invalid_new_consumer_name = Need a non-null, non-empty name for the new consumer!
Modified: components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties
===================================================================
--- components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2011-03-30 14:47:40 UTC (rev 6140)
+++ components/wsrp/branches/2.0.x/admin-gui/src/main/webapp/WEB-INF/classes/Resource_fr.properties 2011-03-30 14:55:57 UTC (rev 6141)
@@ -175,7 +175,7 @@
import_import=Importer
import_use=Importer?
bean_consumer_import_success=''{0}'' portlets ont �t� correctement import�es!
-bean_consumer_import_failed_portlets=Les portlets suivantes n'ont pas pu �tre import�es: {0}
+bean_consumer_import_failed_portlets=La portlet suivante n''a pas pu �tre import�e: {0}
edit_consumer_export=Exporter portlets
edit_consumer_export_title=Portlets en export
edit_consumer_import=Importer portlets
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java 2011-03-30 14:47:40 UTC (rev 6140)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java 2011-03-30 14:55:57 UTC (rev 6141)
@@ -47,7 +47,7 @@
return consumer;
}
- public void saveChangesTo(Consumer consumer)
+ public void saveChangesTo(Consumer consumer) throws RegistrationException
{
ParameterValidation.throwIllegalArgExceptionIfNull(consumer, "Consumer");
@@ -59,7 +59,7 @@
internalSaveChangesTo(consumer);
}
- public void saveChangesTo(Registration registration)
+ public void saveChangesTo(Registration registration) throws RegistrationException
{
ParameterValidation.throwIllegalArgExceptionIfNull(registration, "Registration");
@@ -163,27 +163,27 @@
// internal methods: extension points for subclasses
- protected abstract void internalAddRegistration(RegistrationSPI registration);
+ protected abstract void internalAddRegistration(RegistrationSPI registration) throws RegistrationException;
- protected abstract RegistrationSPI internalRemoveRegistration(String registrationId);
+ protected abstract RegistrationSPI internalRemoveRegistration(String registrationId) throws RegistrationException;
- protected abstract RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map<QName, Object> registrationProperties);
+ protected abstract RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map<QName, Object> registrationProperties) throws RegistrationException;
- protected abstract void internalAddConsumer(ConsumerSPI consumer);
+ protected abstract void internalAddConsumer(ConsumerSPI consumer) throws RegistrationException;
- protected abstract ConsumerSPI internalRemoveConsumer(String consumerId);
+ protected abstract ConsumerSPI internalRemoveConsumer(String consumerId) throws RegistrationException;
- protected abstract ConsumerSPI internalCreateConsumer(String consumerId, String consumerName);
+ protected abstract ConsumerSPI internalCreateConsumer(String consumerId, String consumerName) throws RegistrationException;
- protected abstract ConsumerSPI internalSaveChangesTo(Consumer consumer);
-
- protected abstract RegistrationSPI internalSaveChangesTo(Registration registration);
+ protected abstract ConsumerSPI internalSaveChangesTo(Consumer consumer) throws RegistrationException;
- protected abstract void internalAddConsumerGroup(ConsumerGroupSPI group);
+ protected abstract RegistrationSPI internalSaveChangesTo(Registration registration) throws RegistrationException;
- protected abstract ConsumerGroupSPI internalRemoveConsumerGroup(String name);
+ protected abstract void internalAddConsumerGroup(ConsumerGroupSPI group) throws RegistrationException;
- protected abstract ConsumerGroupSPI internalCreateConsumerGroup(String name);
+ protected abstract ConsumerGroupSPI internalRemoveConsumerGroup(String name) throws RegistrationException;
+ protected abstract ConsumerGroupSPI internalCreateConsumerGroup(String name) throws RegistrationException;
+
protected abstract ConsumerSPI getConsumerSPIById(String consumerId) throws RegistrationException;
}
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java 2011-03-30 14:47:40 UTC (rev 6140)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/RegistrationPersistenceManager.java 2011-03-30 14:55:57 UTC (rev 6141)
@@ -47,14 +47,14 @@
*
* @param consumer
*/
- void saveChangesTo(Consumer consumer);
+ void saveChangesTo(Consumer consumer) throws RegistrationException;
/**
* Saves changes made to the specified registration.
*
* @param registration
*/
- void saveChangesTo(Registration registration);
+ void saveChangesTo(Registration registration) throws RegistrationException;
/**
* Retrieves the ConsumerGroup identified by the specified name.
@@ -92,13 +92,13 @@
Registration addRegistrationFor(String consumerId, Map<QName, Object> registrationProperties) throws RegistrationException;
- Collection<? extends ConsumerGroup> getConsumerGroups();
+ Collection<? extends ConsumerGroup> getConsumerGroups() throws RegistrationException;
- Registration getRegistration(String registrationId);
+ Registration getRegistration(String registrationId) throws RegistrationException;
Consumer addConsumerToGroupNamed(String consumerId, String groupName) throws RegistrationException;
- Collection<? extends Consumer> getConsumers();
+ Collection<? extends Consumer> getConsumers() throws RegistrationException;
- Collection<? extends Registration> getRegistrations();
+ Collection<? extends Registration> getRegistrations() throws RegistrationException;
}
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java 2011-03-30 14:47:40 UTC (rev 6140)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/impl/RegistrationManagerImpl.java 2011-03-30 14:55:57 UTC (rev 6141)
@@ -281,7 +281,7 @@
return consumer;
}
- private Object getConsumerOrRegistration(String registrationHandle, boolean getConsumer)
+ private Object getConsumerOrRegistration(String registrationHandle, boolean getConsumer) throws RegistrationException
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(registrationHandle, "registration handle", null);
@@ -296,7 +296,7 @@
}
}
- public Collection<? extends ConsumerGroup> getConsumerGroups()
+ public Collection<? extends ConsumerGroup> getConsumerGroups() throws RegistrationException
{
return persistenceManager.getConsumerGroups();
}
@@ -319,7 +319,7 @@
removeConsumerGroup(getConsumerGroup(name));
}
- public Collection<? extends Consumer> getConsumers()
+ public Collection<? extends Consumer> getConsumers() throws RegistrationException
{
return persistenceManager.getConsumers();
}
@@ -353,20 +353,38 @@
log.debug("Registration properties have changed, existing registrations will be invalidated...");
}
- Collection registrations = persistenceManager.getRegistrations();
- for (Object registration : registrations)
+ try
{
- Registration reg = (Registration)registration;
+ Collection registrations = persistenceManager.getRegistrations();
+ for (Object registration : registrations)
+ {
+ Registration reg = (Registration)registration;
- // pending instead of invalid as technically, the registration is not yet invalid
- reg.setStatus(RegistrationStatus.PENDING);
+ // pending instead of invalid as technically, the registration is not yet invalid
+ reg.setStatus(RegistrationStatus.PENDING);
- // make changes persistent
- Consumer consumer = reg.getConsumer();
- persistenceManager.saveChangesTo(consumer);
-
-// reg.clearAssociatedState(); //todo: do we need to clear the associated state? If we do, should we wait until current operations are done?
+ // make changes persistent
+ Consumer consumer = reg.getConsumer();
+ try
+ {
+ persistenceManager.saveChangesTo(consumer);
+ }
+ catch (RegistrationException e)
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("Couldn't persist changes to Consumer '" + consumer.getId() + "'", e);
+ }
+ }
+ }
}
+ catch (RegistrationException e)
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("Couldn't retrieve registrations...", e);
+ }
+ }
}
/**
@@ -384,6 +402,13 @@
// GTNWSRP-72
public void portletContextsHaveChanged(Registration registration)
{
- persistenceManager.saveChangesTo(registration);
+ try
+ {
+ persistenceManager.saveChangesTo(registration);
+ }
+ catch (RegistrationException e)
+ {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
}
}
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java 2011-03-30 14:47:40 UTC (rev 6140)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/registration/impl/RegistrationPersistenceManagerImpl.java 2011-03-30 14:55:57 UTC (rev 6141)
@@ -89,19 +89,19 @@
}
@Override
- protected void internalAddRegistration(RegistrationSPI registration)
+ protected void internalAddRegistration(RegistrationSPI registration) throws RegistrationException
{
registrations.put(registration.getPersistentKey(), registration);
}
@Override
- protected RegistrationSPI internalRemoveRegistration(String registrationId)
+ protected RegistrationSPI internalRemoveRegistration(String registrationId) throws RegistrationException
{
return registrations.remove(registrationId);
}
@Override
- protected RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map<QName, Object> registrationProperties)
+ protected RegistrationSPI internalCreateRegistration(ConsumerSPI consumer, Map<QName, Object> registrationProperties) throws RegistrationException
{
return newRegistrationSPI(consumer, registrationProperties, "" + lastRegistrationId++);
}
@@ -112,19 +112,19 @@
}
@Override
- protected void internalAddConsumer(ConsumerSPI consumer)
+ protected void internalAddConsumer(ConsumerSPI consumer) throws RegistrationException
{
consumers.put(consumer.getId(), consumer);
}
@Override
- protected ConsumerSPI internalRemoveConsumer(String consumerId)
+ protected ConsumerSPI internalRemoveConsumer(String consumerId) throws RegistrationException
{
return consumers.remove(consumerId);
}
@Override
- protected ConsumerSPI internalCreateConsumer(String consumerId, String consumerName)
+ protected ConsumerSPI internalCreateConsumer(String consumerId, String consumerName) throws RegistrationException
{
ConsumerSPI consumerSPI = newConsumerSPI(consumerId, consumerName);
consumerSPI.setPersistentKey(consumerId);
@@ -137,19 +137,19 @@
}
@Override
- protected void internalAddConsumerGroup(ConsumerGroupSPI group)
+ protected void internalAddConsumerGroup(ConsumerGroupSPI group) throws RegistrationException
{
groups.put(group.getName(), group);
}
@Override
- protected ConsumerGroupSPI internalRemoveConsumerGroup(String name)
+ protected ConsumerGroupSPI internalRemoveConsumerGroup(String name) throws RegistrationException
{
return groups.remove(name);
}
@Override
- protected ConsumerGroupSPI internalCreateConsumerGroup(String name)
+ protected ConsumerGroupSPI internalCreateConsumerGroup(String name) throws RegistrationException
{
ConsumerGroupSPI groupSPI = newConsumerGroupSPI(name);
groupSPI.setPersistentKey(name);
@@ -168,13 +168,13 @@
}
@Override
- protected ConsumerSPI internalSaveChangesTo(Consumer consumer)
+ protected ConsumerSPI internalSaveChangesTo(Consumer consumer) throws RegistrationException
{
return (ConsumerSPI)consumer; // nothing to do here, left up to subclasses to implement update in persistent store
}
@Override
- protected RegistrationSPI internalSaveChangesTo(Registration registration)
+ protected RegistrationSPI internalSaveChangesTo(Registration registration) throws RegistrationException
{
return (RegistrationSPI)registration; // nothing to do here, left up to subclasses to implement update in persistent store
}
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java 2011-03-30 14:47:40 UTC (rev 6140)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/PortletManagementHandler.java 2011-03-30 14:55:57 UTC (rev 6141)
@@ -854,7 +854,7 @@
else // default error message.
{
errorCode = ErrorCodes.Codes.OPERATIONFAILED;
- reason = "Error preparing portlet for export";
+ reason = "Error importing portlet.";
}
if (!failedPortletsMap.containsKey(errorCode.name()))
Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/RegistrationHandler.java
===================================================================
--- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/RegistrationHandler.java 2011-03-30 14:47:40 UTC (rev 6140)
+++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/handlers/RegistrationHandler.java 2011-03-30 14:55:57 UTC (rev 6141)
@@ -145,7 +145,14 @@
capabilities.setSupportedUserScopes(registrationData.getConsumerUserScopes());
capabilities.setSupportsGetMethod(registrationData.isMethodGetSupported());
- producer.getRegistrationManager().getPersistenceManager().saveChangesTo(consumer);
+ try
+ {
+ producer.getRegistrationManager().getPersistenceManager().saveChangesTo(consumer);
+ }
+ catch (RegistrationException e)
+ {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
}
public List<Extension> deregister(RegistrationContext deregister)
13 years, 9 months
- 1
- 0
gatein SVN: r6140 - in sandbox/cdi_support/pc/branches/cdi: api and 40 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-03-30 10:47:40 -0400 (Wed, 30 Mar 2011)
New Revision: 6140
Added:
sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/
sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/
sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/portlet.xml
sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/web.xml
sandbox/cdi_support/pc/branches/cdi/test/core/src/main/resources/
sandbox/cdi_support/pc/branches/cdi/test/core/src/main/resources/common.xml
sandbox/cdi_support/pc/branches/cdi/test/core/src/test/java/org/gatein/pc/test/portlet/jsr286/ext/cache/
sandbox/cdi_support/pc/branches/cdi/test/core/src/test/java/org/gatein/pc/test/portlet/jsr286/ext/cache/CacheValidationTestCase.java
Removed:
sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/
sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/portlet.xml
sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/web.xml
sandbox/cdi_support/pc/branches/cdi/test/core/src/main/resources/common.xml
sandbox/cdi_support/pc/branches/cdi/test/core/src/test/java/org/gatein/pc/test/portlet/jsr286/ext/cache/CacheValidationTestCase.java
Modified:
sandbox/cdi_support/pc/branches/cdi/
sandbox/cdi_support/pc/branches/cdi/api/pom.xml
sandbox/cdi_support/pc/branches/cdi/api/src/main/java/org/gatein/pc/api/invocation/response/ContentResponse.java
sandbox/cdi_support/pc/branches/cdi/api/src/main/java/org/gatein/pc/api/invocation/response/FragmentResponse.java
sandbox/cdi_support/pc/branches/cdi/bridge/pom.xml
sandbox/cdi_support/pc/branches/cdi/controller/pom.xml
sandbox/cdi_support/pc/branches/cdi/distrib/distrib.xml
sandbox/cdi_support/pc/branches/cdi/docs/pom.xml
sandbox/cdi_support/pc/branches/cdi/docs/user-guide/pom.xml
sandbox/cdi_support/pc/branches/cdi/federation/pom.xml
sandbox/cdi_support/pc/branches/cdi/jsr168api/pom.xml
sandbox/cdi_support/pc/branches/cdi/management/pom.xml
sandbox/cdi_support/pc/branches/cdi/mc/pom.xml
sandbox/cdi_support/pc/branches/cdi/pom.xml
sandbox/cdi_support/pc/branches/cdi/portal/pom.xml
sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-jboss51.xml
sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-jboss6.xml
sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-tomcat60.xml
sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-tomcat70.xml
sandbox/cdi_support/pc/branches/cdi/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
sandbox/cdi_support/pc/branches/cdi/portlet/pom.xml
sandbox/cdi_support/pc/branches/cdi/portlet/src/main/java/org/gatein/pc/portlet/aspects/ConsumerCacheInterceptor.java
sandbox/cdi_support/pc/branches/cdi/samples/pom.xml
sandbox/cdi_support/pc/branches/cdi/test/core/pom.xml
sandbox/cdi_support/pc/branches/cdi/test/core/src/main/build.xml
sandbox/cdi_support/pc/branches/cdi/test/core/src/main/java/org/gatein/pc/test/unit/Assertion.java
sandbox/cdi_support/pc/branches/cdi/test/pom.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/jboss42/pom.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/jboss42/src/test/resources/test/remote-jboss-unit.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/jboss51/pom.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/jboss51/src/test/resources/test/remote-jboss-unit.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/jboss6/
sandbox/cdi_support/pc/branches/cdi/test/servers/jboss6/pom.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/jboss6/src/test/resources/test/remote-jboss-unit.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/jetty6/pom.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/jetty6/src/test/resources/test/remote-jboss-unit.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/pom.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/src/common/resources/common.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat6/pom.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat6/src/test/resources/test/remote-jboss-unit.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat7/pom.xml
sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat7/src/test/resources/test/remote-jboss-unit.xml
Log:
Merged from pc trunk up to r6137
Property changes on: sandbox/cdi_support/pc/branches/cdi
___________________________________________________________________
Added: svn:mergeinfo
+ /components/pc/trunk:5848-6137
Modified: sandbox/cdi_support/pc/branches/cdi/api/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/api/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/api/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.pc</groupId>
Modified: sandbox/cdi_support/pc/branches/cdi/api/src/main/java/org/gatein/pc/api/invocation/response/ContentResponse.java
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/api/src/main/java/org/gatein/pc/api/invocation/response/ContentResponse.java 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/api/src/main/java/org/gatein/pc/api/invocation/response/ContentResponse.java 2011-03-30 14:47:40 UTC (rev 6140)
@@ -78,6 +78,22 @@
this.cacheControl = cacheControl;
}
+ public ContentResponse(
+ ContentResponse that,
+ CacheControl cacheControl)
+ {
+ if (that == null)
+ {
+ throw new IllegalArgumentException("No null content response can be provided for copy");
+ }
+ this.properties = that.properties;
+ this.attributes = that.attributes;
+ this.contentType = that.contentType;
+ this.bytes = that.bytes;
+ this.chars = that.chars;
+ this.cacheControl = cacheControl;
+ }
+
public ResponseProperties getProperties()
{
return properties;
Modified: sandbox/cdi_support/pc/branches/cdi/api/src/main/java/org/gatein/pc/api/invocation/response/FragmentResponse.java
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/api/src/main/java/org/gatein/pc/api/invocation/response/FragmentResponse.java 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/api/src/main/java/org/gatein/pc/api/invocation/response/FragmentResponse.java 2011-03-30 14:47:40 UTC (rev 6140)
@@ -60,6 +60,15 @@
this.nextModes = nextModes;
}
+ public FragmentResponse(FragmentResponse that, CacheControl cacheControl)
+ {
+ super(that, cacheControl);
+
+ //
+ this.title = that.title;
+ this.nextModes = that.nextModes;
+ }
+
/**
* Return the fragment title.
*
Modified: sandbox/cdi_support/pc/branches/cdi/bridge/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/bridge/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/bridge/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-bridge</artifactId>
Modified: sandbox/cdi_support/pc/branches/cdi/controller/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/controller/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/controller/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-controller</artifactId>
@@ -23,6 +23,24 @@
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-remote</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: sandbox/cdi_support/pc/branches/cdi/distrib/distrib.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/distrib/distrib.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/distrib/distrib.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,9 +2,9 @@
<property name="source.dir" value="../"/>
<property name="src.docs.dir" value="${source.dir}/docs"/>
- <property name="pc.release.version" value="2.1.1-GA"/>
- <property name="demo.release.version" value="2.1.1-GA"/>
- <property name="maven.version" value="2.1.1-GA"/>
+ <property name="pc.release.version" value="2.3.0-Beta01"/>
+ <property name="demo.release.version" value="2.3.0-Beta01"/>
+ <property name="maven.version" value="2.3.0-Beta01"/>
<!-- -->
<property name="pc.release.name" value="gatein-portletcontainer-${pc.release.version}"/>
Modified: sandbox/cdi_support/pc/branches/cdi/docs/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/docs/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/docs/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
Modified: sandbox/cdi_support/pc/branches/cdi/docs/user-guide/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/docs/user-guide/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/docs/user-guide/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<groupId>org.gatein.pc</groupId>
<artifactId>user-guide-${translation}</artifactId>
Modified: sandbox/cdi_support/pc/branches/cdi/federation/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/federation/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/federation/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-federation</artifactId>
Modified: sandbox/cdi_support/pc/branches/cdi/jsr168api/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/jsr168api/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/jsr168api/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-jsr168api</artifactId>
Modified: sandbox/cdi_support/pc/branches/cdi/management/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/management/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/management/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-management</artifactId>
Modified: sandbox/cdi_support/pc/branches/cdi/mc/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/mc/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/mc/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-mc</artifactId>
Modified: sandbox/cdi_support/pc/branches/cdi/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -29,13 +29,13 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.gatein</groupId>
<artifactId>gatein-parent</artifactId>
- <version>1.0.2-GA</version>
+ <version>1.1.0-Beta01</version>
</parent>
<scm>
@@ -45,8 +45,8 @@
</scm>
<properties>
- <version.gatein.common>2.0.3-GA</version.gatein.common>
- <version.gatein.wci>2.1.0-Alpha03</version.gatein.wci>
+ <version.gatein.common>2.0.4-Beta01</version.gatein.common>
+ <version.gatein.wci>2.1.0-Beta01</version.gatein.wci>
<version.apache.portals.bridges>1.0.4</version.apache.portals.bridges>
<version.apache.taglibs>1.1.2</version.apache.taglibs>
<version.apache.log4j>1.2.14</version.apache.log4j>
@@ -67,7 +67,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.0.2-GA</version>
+ <version>1.0.3-Beta01</version>
<type>pom</type>
<scope>import</scope>
</dependency>
@@ -125,7 +125,13 @@
<artifactId>pc-api</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.gatein.pc</groupId>
+ <artifactId>pc-test-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
@@ -153,12 +159,12 @@
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
<version>${version.apache.taglibs}</version>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
<version>${version.apache.taglibs}</version>
</dependency>
@@ -301,43 +307,4 @@
</profile>
</profiles>
- <repositories>
-
- <repository>
- <id>jboss-public-repository-group</id>
- <name>JBoss Public Maven Repository Group</name>
- <url>https://repository.jboss.org/nexus/content/groups/public/</url>
- <layout>default</layout>
- <releases>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- </repository>
- <repository>
- <id>repository.jboss.org</id>
- <name>JBoss Repository</name>
- <layout>default</layout>
- <url>http://repository.jboss.org/maven2/</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>snapshots.jboss.org</id>
- <name>JBoss Snapshots Repository</name>
- <layout>default</layout>
- <url>http://snapshots.jboss.org/maven2/</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
- </repository>
- </repositories>
-
</project>
Modified: sandbox/cdi_support/pc/branches/cdi/portal/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/portal/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/portal/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portal</artifactId>
@@ -57,7 +57,6 @@
<groupId>org.gatein.pc</groupId>
<artifactId>pc-api</artifactId>
</dependency>
-
<dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
@@ -71,6 +70,16 @@
<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-common-logging-jdk</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>jboss</groupId>
@@ -97,16 +106,16 @@
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -115,7 +124,6 @@
<artifactId>slf4j-log4j12</artifactId>
<version>1.5.6</version>
</dependency>
-
</dependencies>
<build>
Modified: sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-jboss51.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-jboss51.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-jboss51.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -43,12 +43,6 @@
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory></outputDirectory>
- <includes>
- <include></include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
Modified: sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-jboss6.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-jboss6.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-jboss6.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -43,12 +43,6 @@
</includes>
</dependencySet>
- <dependencySet>
- <outputDirectory></outputDirectory>
- <includes>
- <include></include>
- </includes>
- </dependencySet>
</dependencySets>
</assembly>
Modified: sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-tomcat60.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-tomcat60.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-tomcat60.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -23,7 +23,7 @@
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-log4j12</include>
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>javax.ccpp:ccpp</include>
<include>javax.activation:activation</include>
<include>javax.portlet:portlet-api</include>
@@ -33,8 +33,8 @@
<include>apache-xerces:resolver</include>
<include>apache-xerces:xml-apis</include>
- <include>apache-taglibs:jstl</include>
- <include>apache-taglibs:standard</include>
+ <include>javax.servlet:jstl</include>
+ <include>taglibs:standard</include>
</includes>
</dependencySet>
Modified: sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-tomcat70.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-tomcat70.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/portal/src/assemble/simple-portal-tomcat70.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -23,7 +23,7 @@
<include>org.slf4j:slf4j-api</include>
<include>org.slf4j:slf4j-log4j12</include>
- <include>apache-log4j:log4j</include>
+ <include>log4j:log4j</include>
<include>javax.ccpp:ccpp</include>
<include>javax.activation:activation</include>
<include>javax.portlet:portlet-api</include>
@@ -33,8 +33,8 @@
<include>apache-xerces:resolver</include>
<include>apache-xerces:xml-apis</include>
- <include>apache-taglibs:jstl</include>
- <include>apache-taglibs:standard</include>
+ <include>javax.servlet:jstl</include>
+ <include>taglibs:standard</include>
</includes>
</dependencySet>
Modified: sandbox/cdi_support/pc/branches/cdi/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/portal/src/main/resources/simple-portal-war/WEB-INF/web.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -47,7 +47,7 @@
<url-pattern>*.jsp</url-pattern>
</filter-mapping>
<listener>
- <listener-class>org.gatein.pc.test.bootstrap.ServletContextBootstrap</listener-class>
+ <listener-class>org.gatein.common.mc.bootstrap.WebBootstrap</listener-class>
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
Modified: sandbox/cdi_support/pc/branches/cdi/portlet/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/portlet/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/portlet/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-portlet</artifactId>
@@ -41,6 +41,24 @@
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-remote</artifactId>
<scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: sandbox/cdi_support/pc/branches/cdi/portlet/src/main/java/org/gatein/pc/portlet/aspects/ConsumerCacheInterceptor.java
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/portlet/src/main/java/org/gatein/pc/portlet/aspects/ConsumerCacheInterceptor.java 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/portlet/src/main/java/org/gatein/pc/portlet/aspects/ConsumerCacheInterceptor.java 2011-03-30 14:47:40 UTC (rev 6140)
@@ -24,6 +24,7 @@
import org.gatein.pc.api.invocation.PortletInvocation;
import org.gatein.pc.api.invocation.RenderInvocation;
+import org.gatein.pc.api.invocation.response.FragmentResponse;
import org.gatein.pc.portlet.PortletInvokerInterceptor;
import org.gatein.pc.portlet.aspects.cache.ContentRef;
import org.gatein.pc.portlet.aspects.cache.StrongContentRef;
@@ -147,13 +148,15 @@
}
}
- ContentResponse fragment = cachedEntry != null ? cachedEntry.contentRef.getContent() : null;
+ //
+ final ContentResponse cachedContent = cachedEntry != null ? cachedEntry.contentRef.getContent() : null;
- // If no valid fragment we must invoke
- if (fragment == null || cachedEntry.expirationTimeMillis < System.currentTimeMillis())
+ // If no valid content we must invoke
+ long now = System.currentTimeMillis();
+ if (cachedContent == null || cachedEntry.expirationTimeMillis < now)
{
- // Set validation token for revalidation only we have have a fragment
- if (fragment != null)
+ // Set validation token for revalidation only we have have a content
+ if (cachedContent != null)
{
renderInvocation.setValidationToken(cachedEntry.validationToken);
}
@@ -161,54 +164,69 @@
// Invoke
PortletInvocationResponse response = super.invoke(invocation);
- // Try to cache any fragment result
- CacheControl control = null;
- if (response instanceof ContentResponse)
+ // If we had a cached content that was revalidated we substitute
+ if (response instanceof RevalidateMarkupResponse && cachedContent != null)
{
- fragment = (ContentResponse)response;
- control = fragment.getCacheControl();
- }
- else if (response instanceof RevalidateMarkupResponse)
- {
+ // Normally we receive such response when the validation token was set which implies we have an existing content
+ // We substitute with the appropriate content response
RevalidateMarkupResponse revalidate = (RevalidateMarkupResponse)response;
- control = revalidate.getCacheControl();
- }
-
- // Compute expiration time, i.e when it will expire
- long expirationTimeMillis = 0;
- String validationToken = null;
- if (control != null)
- {
- if (control.getExpirationSecs() == -1)
+ CacheControl control = revalidate.getCacheControl();
+ if (cachedContent instanceof FragmentResponse)
{
- expirationTimeMillis = Long.MAX_VALUE;
+ response = new FragmentResponse((FragmentResponse)cachedContent, control);
}
- else if (control.getExpirationSecs() > 0)
+ else
{
- expirationTimeMillis = System.currentTimeMillis() + control.getExpirationSecs() * 1000;
+ response = new ContentResponse(cachedContent, control);
}
- if (control.getValidationToken() != null)
- {
- validationToken = control.getValidationToken();
- }
- else if (cachedEntry != null)
- {
- validationToken = cachedEntry.validationToken;
- }
}
- // Cache if we can
- if (expirationTimeMillis > 0)
+ // If we have a content cache it whenever it is possible
+ if (response instanceof ContentResponse)
{
- CacheEntry cacheEntry = new CacheEntry(
- navigationalState,
- publicNavigationalState,
- windowState,
- mode,
- fragment,
- expirationTimeMillis,
- validationToken);
- userContext.setAttribute(scopeKey, cacheEntry);
+ ContentResponse contentResponse = (ContentResponse)response;
+ CacheControl control = contentResponse.getCacheControl();
+
+ //
+ if (control != null)
+ {
+ // Compute expiration time, i.e when it will expire
+ long expirationTimeMillis = 0;
+ if (control.getExpirationSecs() == -1)
+ {
+ expirationTimeMillis = Long.MAX_VALUE;
+ }
+ else if (control.getExpirationSecs() > 0)
+ {
+ expirationTimeMillis = System.currentTimeMillis() + control.getExpirationSecs() * 1000;
+ }
+
+ // Cache if we can
+ if (expirationTimeMillis > 0)
+ {
+ // Use validation token if any
+ String validationToken = null;
+ if (control.getValidationToken() != null)
+ {
+ validationToken = control.getValidationToken();
+ }
+ else if (cachedEntry != null)
+ {
+ validationToken = cachedEntry.validationToken;
+ }
+
+ CacheEntry cacheEntry = new CacheEntry(
+ navigationalState,
+ publicNavigationalState,
+ windowState,
+ mode,
+ contentResponse,
+ expirationTimeMillis,
+ validationToken);
+ userContext.setAttribute(scopeKey, cacheEntry);
+ }
+
+ }
}
//
@@ -216,8 +234,8 @@
}
else
{
- // Use the cached fragment
- return fragment;
+ // Use the cached content
+ return cachedContent;
}
}
else
Modified: sandbox/cdi_support/pc/branches/cdi/samples/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/samples/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/samples/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-samples</artifactId>
Modified: sandbox/cdi_support/pc/branches/cdi/test/core/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/core/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/core/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-core</artifactId>
@@ -45,7 +45,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -67,6 +67,22 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -76,10 +92,42 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
Modified: sandbox/cdi_support/pc/branches/cdi/test/core/src/main/build.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/core/src/main/build.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/core/src/main/build.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -178,6 +178,7 @@
<package-jsr286-ext-test test="event"/>
<package-jsr286-ext-test test="eventsupport"/>
<package-jsr286-ext-test test="portletmode"/>
+ <package-jsr286-ext-test test="cache"/>
</target>
Modified: sandbox/cdi_support/pc/branches/cdi/test/core/src/main/java/org/gatein/pc/test/unit/Assertion.java
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/core/src/main/java/org/gatein/pc/test/unit/Assertion.java 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/core/src/main/java/org/gatein/pc/test/unit/Assertion.java 2011-03-30 14:47:40 UTC (rev 6140)
@@ -1493,7 +1493,7 @@
API286_MIME_RESPONSE_1(new API(MimeResponse.class), "CACHE_SCOPE"),
API286_MIME_RESPONSE_2(new API(MimeResponse.class), "ETAG"),
- API286_MIME_RESPONSE_3(new API(MimeResponse.class), "EXPIRIATION_CACHE"),
+ API286_MIME_RESPONSE_3(new API(MimeResponse.class), "EXPIRATION_CACHE"),
API286_MIME_RESPONSE_4(new API(MimeResponse.class), "MARKUP_HEAD_ELEMENT"),
API286_MIME_RESPONSE_5(new API(MimeResponse.class), "NAMESPACED_RESPONSE"),
API286_MIME_RESPONSE_6(new API(MimeResponse.class), "PRIVATE_SCOPE"),
@@ -1858,8 +1858,9 @@
EXT_NEVER_EXPIRING_CACHE_5(new EXT("Never expiring cache"), "Calling portlet with different window state invalidates the cache"),
EXT_NO_CACHE_1(new EXT("No Cache"), "Caching behaviour with explicit no cache setting in portlet.xml"),
- EXT_NO_CACHE_2(new EXT("No Cache"), "Caching behaviour with implicit no cache setting in portlet.xml"),
+ EXT_CACHE_VALIDATION(new EXT("Cache revalidation"), "Cache revalidation"),
+
EXT_PORTLET_CONFIG_1(new EXT("PortletConfig"), "Obtain resource bundle during portlet init()"),
EXT_PORTLET_CONFIG_2(new EXT("PortletConfig"), "Portlet with no resource bundle and empty <title></title> tag"),
EXT_PORTLET_CONFIG_3(new EXT("PortletConfig"), "Cascade and fallback mechanisms for resource bundle"),
Deleted: sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/portlet.xml
===================================================================
--- components/pc/trunk/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/portlet.xml 2011-03-30 09:02:48 UTC (rev 6137)
+++ sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/portlet.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ 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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
- version="2.0">
-
-
- <portlet>
- <portlet-name>TestUniversalPortletA</portlet-name>
- <portlet-class>org.gatein.pc.test.portlet.framework.UTP1</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- </supports>
- <portlet-info>
- <title></title>
- </portlet-info>
- </portlet>
-
- <portlet>
- <portlet-name>TestUniversalPortletB</portlet-name>
- <portlet-class>org.gatein.pc.test.portlet.framework.UTP2</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- </supports>
- <portlet-info>
- <title></title>
- </portlet-info>
- </portlet>
-
-</portlet-app>
Copied: sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/portlet.xml (from rev 6137, components/pc/trunk/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/portlet.xml)
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/portlet.xml (rev 0)
+++ sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/portlet.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+ version="2.0">
+
+
+ <portlet>
+ <portlet-name>TestUniversalPortletA</portlet-name>
+ <portlet-class>org.gatein.pc.test.portlet.framework.UTP1</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title></title>
+ </portlet-info>
+ </portlet>
+
+ <portlet>
+ <portlet-name>TestUniversalPortletB</portlet-name>
+ <portlet-class>org.gatein.pc.test.portlet.framework.UTP2</portlet-class>
+ <supports>
+ <mime-type>text/html</mime-type>
+ </supports>
+ <portlet-info>
+ <title></title>
+ </portlet-info>
+ </portlet>
+
+</portlet-app>
Deleted: sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/web.xml 2011-03-30 09:02:48 UTC (rev 6137)
+++ sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/web.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -1,35 +0,0 @@
-<?xml version="1.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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<web-app
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
- version="2.4">
-
- <listener>
- <listener-class>org.gatein.pc.test.unit.PortletTestSuite</listener-class>
- </listener>
-
-</web-app>
Copied: sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/web.xml (from rev 6137, components/pc/trunk/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/web.xml)
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/web.xml (rev 0)
+++ sandbox/cdi_support/pc/branches/cdi/test/core/src/main/packaging/jsr286/ext/cache-war/WEB-INF/web.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -0,0 +1,35 @@
+<?xml version="1.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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<web-app
+ xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+ version="2.4">
+
+ <listener>
+ <listener-class>org.gatein.pc.test.unit.PortletTestSuite</listener-class>
+ </listener>
+
+</web-app>
Deleted: sandbox/cdi_support/pc/branches/cdi/test/core/src/main/resources/common.xml
===================================================================
--- components/pc/trunk/test/core/src/main/resources/common.xml 2011-03-30 09:02:48 UTC (rev 6137)
+++ sandbox/cdi_support/pc/branches/cdi/test/core/src/main/resources/common.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -1,282 +0,0 @@
-<?xml version="1.0"?>
-<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
- <path id="maven-ant-tasks.classpath" path="${maven.dependency.org.apache.maven.maven-ant-tasks.jar.path}"/>
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="maven-ant-tasks.classpath" />
-
- <property name="target.dir" value="${basedir}/target"/>
- <property name="test.dir" value="${target.dir}/integration-tests"/>
- <property name="test.cargo.dir" value="${test.dir}/cargo/"/>
-
- <target name="tests.common" depends="prepare_env" >
-
- <echo message="compile classpath: ${compile_classpath}"/>
- <echo message="runtime classpath: ${runtime_classpath}"/>
- <echo message="test classpath: ${test_classpath}"/>
- <echo message="plugin classpath: ${plugin_classpath}"/>
- <echo message="base directory: ${basedir}"/>
-
- <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/>
-
- <antcall target="package-tests"/>
-
- <antcall target="test.container-servlet"/>
-
- </target>
-
- <target name="prepare_env">
-
- <!--Relative path to target dir-->
- <property name="target" value="${basedir}/target"/>
- <property name="test.temp.dir" value="${target}/integration-tests/test-apps"/>
- <property name="test.temp.portlet" value="${test.temp.dir}/portlet-test"/>
- <property name="test.temp.lib" value="${test.temp.dir}/lib"/>
-
- <mkdir dir="${test.temp.dir}"/>
- <mkdir dir="${test.temp.lib}"/>
- <mkdir dir="${target}/jboss-unit"/>
-
- <echo message="Preparing environment"/>
-
- <path id="jboss-logging">
- <pathelement location="${jboss:jboss-common-logging-spi:jar}"/>
- <pathelement location="${jboss:jboss-common-logging-jdk:jar}"/>
- <pathelement location="${jboss:jboss-common-logging-log4j:jar}"/>
- </path>
-
- <path id="jboss-xb">
- <pathelement location="${org.jboss:jbossxb:jar}"/>
- </path>
-
- <path id="portal-common">
- </path>
-
- <path id="portal-common-shared">
- <pathelement location="${org.gatein.common:common-common:jar}"/>
- <pathelement location="${org.gatein.common:common-logging:jar}"/>
- <pathelement location="${org.slf4j:slf4j-simple:jar}"/>
- <pathelement location="${org.slf4j:slf4j-api:jar}"/>
- </path>
-
- <path id="portal-web">
- </path>
-
- <path id="portal-web-shared">
- <pathelement location="${org.gatein.wci:wci-wci:jar}"/>
- </path>
-
- <path id="portal-portlet">
- <pathelement location="${org.gatein.pc:pc-controller:jar}"/>
- <pathelement location="${org.gatein.pc:pc-mc:jar}"/>
- </path>
-
- <path id="portal-portlet-shared">
- <pathelement location="${org.gatein.pc:pc-portlet:jar}"/>
- <pathelement location="${org.gatein.pc:pc-api:jar}"/>
- <pathelement location="${javax.portlet:portlet-api:jar}"/>
- </path>
-
- <path id="jboss-unit">
- </path>
-
- <path id="jboss-unit-shared">
- <pathelement location="${org.jboss.unit:jboss-unit:jar}"/>
- <pathelement location="${org.jboss.unit:jboss-unit-remote:jar}"/>
- <pathelement location="${org.jboss.unit:portal-test-generic:jar}"/>
- <pathelement location="${org.jboss.unit:portal-test:jar}"/>
- <pathelement location="${org.jboss.remoting:jboss-remoting:jar}"/>
- </path>
-
- </target>
-
- <macrodef name="package-ext-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="ext" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-tck-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="tck" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-api-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr168" testsuitetype="api" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-jsr286-tck-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr286" testsuitetype="tck" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-jsr286-api-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr286" testsuitetype="api" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-jsr286-ext-test">
- <attribute name="test"/>
- <sequential>
- <package-testsuite testsuiteversion="jsr286" testsuitetype="ext" testsuitename="@{test}"/>
- </sequential>
- </macrodef>
-
- <macrodef name="package-testsuite">
- <attribute name="testsuiteversion"/>
- <attribute name="testsuitetype"/>
- <attribute name="testsuitename"/>
- <sequential>
-
- <artifact:dependencies pathId="dependency.classpath">
- <dependency
- groupId="org.gatein.pc"
- artifactId="pc-test-core-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
- version="${project.version}"
- type="war"/>
- </artifact:dependencies>
-
- <copy tofile="${test.temp.lib}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war">
- <path refid="dependency.classpath"/>
- </copy>
-
- </sequential>
- </macrodef>
-
- <target name="package-tests" depends="prepare_env">
-
- <package-tck-test test="portletinterface"/>
- <package-tck-test test="dispatcher"/>
- <package-tck-test test="portletrequests"/>
- <package-tck-test test="portletmode"/>
- <package-tck-test test="portletconfig"/>
- <package-tck-test test="portletresponses"/>
- <package-tck-test test="preferences"/>
- <package-tck-test test="portletsession"/>
- <package-tck-test test="portleturl"/>
- <package-tck-test test="windowstates"/>
- <package-tck-test test="portletcontext"/>
- <package-api-test test="portletconfig"/>
- <package-api-test test="portletmode"/>
- <package-api-test test="windowstate"/>
- <package-api-test test="portletsessionutil"/>
- <package-api-test test="portalcontext"/>
- <package-api-test test="portletcontext"/>
- <package-api-test test="portleturl"/>
- <package-api-test test="portletpreferences"/>
- <package-api-test test="portletsession"/>
- <package-api-test test="actionrequest"/>
- <package-api-test test="renderrequest"/>
- <package-api-test test="actionresponse"/>
- <package-api-test test="renderresponse"/>
- <package-ext-test test="nocache"/>
- <package-ext-test test="expiringcache"/>
- <package-ext-test test="neverexpiringcache"/>
- <package-ext-test test="preferences"/>
- <package-ext-test test="session"/>
- <package-ext-test test="portletresponses"/>
- <package-ext-test test="portletrequests"/>
- <package-ext-test test="portletmode"/>
- <package-ext-test test="portletconfig"/>
- <package-ext-test test="taglib"/>
- <package-jsr286-tck-test test="dispatcher"/>
- <package-jsr286-tck-test test="portletconfig"/>
- <package-jsr286-tck-test test="portletconfignonamespace"/>
- <package-jsr286-tck-test test="event"/>
- <package-jsr286-tck-test test="eventnonamespace"/>
- <package-jsr286-tck-test test="stateawareresponse"/>
- <package-jsr286-tck-test test="portletrequests"/>
- <package-jsr286-tck-test test="resourceserving"/>
- <package-jsr286-tck-test test="portleturl"/>
- <package-jsr286-tck-test test="portletfilter"/>
- <package-jsr286-tck-test test="taglib"/>
- <package-jsr286-tck-test test="userinformation"/>
- <package-jsr286-api-test test="event"/>
- <package-jsr286-api-test test="portleturl"/>
- <package-jsr286-ext-test test="portletrequests"/>
- <package-jsr286-ext-test test="portletfilter"/>
- <package-jsr286-ext-test test="portletresponses"/>
- <package-jsr286-ext-test test="dispatcher"/>
- <package-jsr286-ext-test test="portletcontext"/>
- <package-jsr286-ext-test test="portletinterface"/>
- <package-jsr286-ext-test test="event"/>
- <package-jsr286-ext-test test="eventsupport"/>
- <package-jsr286-ext-test test="portletmode"/>
- <package-jsr286-ext-test test="cache"/>
-
- <!-- -->
- <copy todir="${target}/test-classes/portlet-test-war/WEB-INF/lib" flatten="true">
- <path refid="${test.server.name}-${test.server.version}"/>
- <path>
- <pathelement location="${org.gatein.pc:pc-test-core:jar}"/>
- <pathelement location="${org.gatein.pc:pc-test-core:test-jar:tests}"/>
- </path>
- </copy>
- <mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/>
- <war
- destfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war"
- needxmlfile="false">
- <fileset dir="${target}/test-classes/portlet-test-war"/>
- </war>
-
- </target>
-
- <target name="cargo.setup">
- <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/>
- <mkdir dir="${cargo.log.dir}"/>
- <taskdef resource="cargo.tasks">
- <classpath>
- <pathelement path="${plugin_classpath}"/>
- </classpath>
- </taskdef>
- </target>
-
- <target name="test.container-servlet">
- <echo message="Starting ${test.server.name} ${test.server.version} with ${test.remote.server.name} to execute ${test.server.name} tests"/>
- <antcall target="cargo.start">
- <param name="cargo.wait" value="false"/>
- </antcall>
- <antcall target="tests.remote">
- <param name="test.server.name" value="${test.remote.server.name}"/>
- </antcall>
- <antcall target="cargo.stop"/>
- </target>
-
- <target name="tests.remote">
-
- <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
-
- <jboss-unit jpda="false" jpdaPort="9000" jpdaSuspend="true" failOnError="true">
-
- <tests config="${target}/test-classes/test/remote-jboss-unit.xml">
- <property name="archivePath" value="${test.temp.lib}"/>
- <property name="serverName" value="${test.server.name}"/>
- </tests>
-
- <reports>
- <xml toDir="${target}/tests/reports/xml/${test.server.name}"/>
- <html toDir="${target}/tests/reports/html/${test.server.name}"/>
- </reports>
-
- <classpath>
- <pathelement location="${test.temp.lib}"/>
- <pathelement location="${target}/test-classes/test"/>
- <pathelement path="${test_classpath}"/>
- </classpath>
-
- </jboss-unit>
-
- </target>
-
-</project>
Copied: sandbox/cdi_support/pc/branches/cdi/test/core/src/main/resources/common.xml (from rev 6137, components/pc/trunk/test/core/src/main/resources/common.xml)
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/core/src/main/resources/common.xml (rev 0)
+++ sandbox/cdi_support/pc/branches/cdi/test/core/src/main/resources/common.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -0,0 +1,282 @@
+<?xml version="1.0"?>
+<project name="portlet-integration-test" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
+
+ <path id="maven-ant-tasks.classpath" path="${maven.dependency.org.apache.maven.maven-ant-tasks.jar.path}"/>
+ <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
+ uri="antlib:org.apache.maven.artifact.ant"
+ classpathref="maven-ant-tasks.classpath" />
+
+ <property name="target.dir" value="${basedir}/target"/>
+ <property name="test.dir" value="${target.dir}/integration-tests"/>
+ <property name="test.cargo.dir" value="${test.dir}/cargo/"/>
+
+ <target name="tests.common" depends="prepare_env" >
+
+ <echo message="compile classpath: ${compile_classpath}"/>
+ <echo message="runtime classpath: ${runtime_classpath}"/>
+ <echo message="test classpath: ${test_classpath}"/>
+ <echo message="plugin classpath: ${plugin_classpath}"/>
+ <echo message="base directory: ${basedir}"/>
+
+ <echo message="You can run small subset of tests using -Pjboss42, -Pjboss51, -Ptomcat6, -Ptomcat7"/>
+
+ <antcall target="package-tests"/>
+
+ <antcall target="test.container-servlet"/>
+
+ </target>
+
+ <target name="prepare_env">
+
+ <!--Relative path to target dir-->
+ <property name="target" value="${basedir}/target"/>
+ <property name="test.temp.dir" value="${target}/integration-tests/test-apps"/>
+ <property name="test.temp.portlet" value="${test.temp.dir}/portlet-test"/>
+ <property name="test.temp.lib" value="${test.temp.dir}/lib"/>
+
+ <mkdir dir="${test.temp.dir}"/>
+ <mkdir dir="${test.temp.lib}"/>
+ <mkdir dir="${target}/jboss-unit"/>
+
+ <echo message="Preparing environment"/>
+
+ <path id="jboss-logging">
+ <pathelement location="${jboss:jboss-common-logging-spi:jar}"/>
+ <pathelement location="${jboss:jboss-common-logging-jdk:jar}"/>
+ <pathelement location="${jboss:jboss-common-logging-log4j:jar}"/>
+ </path>
+
+ <path id="jboss-xb">
+ <pathelement location="${org.jboss:jbossxb:jar}"/>
+ </path>
+
+ <path id="portal-common">
+ </path>
+
+ <path id="portal-common-shared">
+ <pathelement location="${org.gatein.common:common-common:jar}"/>
+ <pathelement location="${org.gatein.common:common-logging:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-simple:jar}"/>
+ <pathelement location="${org.slf4j:slf4j-api:jar}"/>
+ </path>
+
+ <path id="portal-web">
+ </path>
+
+ <path id="portal-web-shared">
+ <pathelement location="${org.gatein.wci:wci-wci:jar}"/>
+ </path>
+
+ <path id="portal-portlet">
+ <pathelement location="${org.gatein.pc:pc-controller:jar}"/>
+ <pathelement location="${org.gatein.pc:pc-mc:jar}"/>
+ </path>
+
+ <path id="portal-portlet-shared">
+ <pathelement location="${org.gatein.pc:pc-portlet:jar}"/>
+ <pathelement location="${org.gatein.pc:pc-api:jar}"/>
+ <pathelement location="${javax.portlet:portlet-api:jar}"/>
+ </path>
+
+ <path id="jboss-unit">
+ </path>
+
+ <path id="jboss-unit-shared">
+ <pathelement location="${org.jboss.unit:jboss-unit:jar}"/>
+ <pathelement location="${org.jboss.unit:jboss-unit-remote:jar}"/>
+ <pathelement location="${org.jboss.unit:portal-test-generic:jar}"/>
+ <pathelement location="${org.jboss.unit:portal-test:jar}"/>
+ <pathelement location="${org.jboss.remoting:jboss-remoting:jar}"/>
+ </path>
+
+ </target>
+
+ <macrodef name="package-ext-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="ext" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-tck-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="tck" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-api-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr168" testsuitetype="api" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-tck-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="tck" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-api-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="api" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-jsr286-ext-test">
+ <attribute name="test"/>
+ <sequential>
+ <package-testsuite testsuiteversion="jsr286" testsuitetype="ext" testsuitename="@{test}"/>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-testsuite">
+ <attribute name="testsuiteversion"/>
+ <attribute name="testsuitetype"/>
+ <attribute name="testsuitename"/>
+ <sequential>
+
+ <artifact:dependencies pathId="dependency.classpath">
+ <dependency
+ groupId="org.gatein.pc"
+ artifactId="pc-test-core-@{testsuiteversion}-@{testsuitetype}-@{testsuitename}"
+ version="${project.version}"
+ type="war"/>
+ </artifact:dependencies>
+
+ <copy tofile="${test.temp.lib}/test-@{testsuiteversion}-@{testsuitetype}-(a){testsuitename}.war">
+ <path refid="dependency.classpath"/>
+ </copy>
+
+ </sequential>
+ </macrodef>
+
+ <target name="package-tests" depends="prepare_env">
+
+ <package-tck-test test="portletinterface"/>
+ <package-tck-test test="dispatcher"/>
+ <package-tck-test test="portletrequests"/>
+ <package-tck-test test="portletmode"/>
+ <package-tck-test test="portletconfig"/>
+ <package-tck-test test="portletresponses"/>
+ <package-tck-test test="preferences"/>
+ <package-tck-test test="portletsession"/>
+ <package-tck-test test="portleturl"/>
+ <package-tck-test test="windowstates"/>
+ <package-tck-test test="portletcontext"/>
+ <package-api-test test="portletconfig"/>
+ <package-api-test test="portletmode"/>
+ <package-api-test test="windowstate"/>
+ <package-api-test test="portletsessionutil"/>
+ <package-api-test test="portalcontext"/>
+ <package-api-test test="portletcontext"/>
+ <package-api-test test="portleturl"/>
+ <package-api-test test="portletpreferences"/>
+ <package-api-test test="portletsession"/>
+ <package-api-test test="actionrequest"/>
+ <package-api-test test="renderrequest"/>
+ <package-api-test test="actionresponse"/>
+ <package-api-test test="renderresponse"/>
+ <package-ext-test test="nocache"/>
+ <package-ext-test test="expiringcache"/>
+ <package-ext-test test="neverexpiringcache"/>
+ <package-ext-test test="preferences"/>
+ <package-ext-test test="session"/>
+ <package-ext-test test="portletresponses"/>
+ <package-ext-test test="portletrequests"/>
+ <package-ext-test test="portletmode"/>
+ <package-ext-test test="portletconfig"/>
+ <package-ext-test test="taglib"/>
+ <package-jsr286-tck-test test="dispatcher"/>
+ <package-jsr286-tck-test test="portletconfig"/>
+ <package-jsr286-tck-test test="portletconfignonamespace"/>
+ <package-jsr286-tck-test test="event"/>
+ <package-jsr286-tck-test test="eventnonamespace"/>
+ <package-jsr286-tck-test test="stateawareresponse"/>
+ <package-jsr286-tck-test test="portletrequests"/>
+ <package-jsr286-tck-test test="resourceserving"/>
+ <package-jsr286-tck-test test="portleturl"/>
+ <package-jsr286-tck-test test="portletfilter"/>
+ <package-jsr286-tck-test test="taglib"/>
+ <package-jsr286-tck-test test="userinformation"/>
+ <package-jsr286-api-test test="event"/>
+ <package-jsr286-api-test test="portleturl"/>
+ <package-jsr286-ext-test test="portletrequests"/>
+ <package-jsr286-ext-test test="portletfilter"/>
+ <package-jsr286-ext-test test="portletresponses"/>
+ <package-jsr286-ext-test test="dispatcher"/>
+ <package-jsr286-ext-test test="portletcontext"/>
+ <package-jsr286-ext-test test="portletinterface"/>
+ <package-jsr286-ext-test test="event"/>
+ <package-jsr286-ext-test test="eventsupport"/>
+ <package-jsr286-ext-test test="portletmode"/>
+ <package-jsr286-ext-test test="cache"/>
+
+ <!-- -->
+ <copy todir="${target}/test-classes/portlet-test-war/WEB-INF/lib" flatten="true">
+ <path refid="${test.server.name}-${test.server.version}"/>
+ <path>
+ <pathelement location="${org.gatein.pc:pc-test-core:jar}"/>
+ <pathelement location="${org.gatein.pc:pc-test-core:test-jar:tests}"/>
+ </path>
+ </copy>
+ <mkdir dir="${test.temp.lib}/${test.server.name}-${test.server.version}"/>
+ <war
+ destfile="${test.temp.lib}/${test.server.name}-${test.server.version}/portlet-test.war"
+ needxmlfile="false">
+ <fileset dir="${target}/test-classes/portlet-test-war"/>
+ </war>
+
+ </target>
+
+ <target name="cargo.setup">
+ <property name="cargo.log.dir" value="${target}/integration-tests/cargo-logs"/>
+ <mkdir dir="${cargo.log.dir}"/>
+ <taskdef resource="cargo.tasks">
+ <classpath>
+ <pathelement path="${plugin_classpath}"/>
+ </classpath>
+ </taskdef>
+ </target>
+
+ <target name="test.container-servlet">
+ <echo message="Starting ${test.server.name} ${test.server.version} with ${test.remote.server.name} to execute ${test.server.name} tests"/>
+ <antcall target="cargo.start">
+ <param name="cargo.wait" value="false"/>
+ </antcall>
+ <antcall target="tests.remote">
+ <param name="test.server.name" value="${test.remote.server.name}"/>
+ </antcall>
+ <antcall target="cargo.stop"/>
+ </target>
+
+ <target name="tests.remote">
+
+ <taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
+
+ <jboss-unit jpda="false" jpdaPort="9000" jpdaSuspend="true" failOnError="true">
+
+ <tests config="${target}/test-classes/test/remote-jboss-unit.xml">
+ <property name="archivePath" value="${test.temp.lib}"/>
+ <property name="serverName" value="${test.server.name}"/>
+ </tests>
+
+ <reports>
+ <xml toDir="${target}/tests/reports/xml/${test.server.name}"/>
+ <html toDir="${target}/tests/reports/html/${test.server.name}"/>
+ </reports>
+
+ <classpath>
+ <pathelement location="${test.temp.lib}"/>
+ <pathelement location="${target}/test-classes/test"/>
+ <pathelement path="${test_classpath}"/>
+ </classpath>
+
+ </jboss-unit>
+
+ </target>
+
+</project>
Deleted: sandbox/cdi_support/pc/branches/cdi/test/core/src/test/java/org/gatein/pc/test/portlet/jsr286/ext/cache/CacheValidationTestCase.java
===================================================================
--- components/pc/trunk/test/core/src/test/java/org/gatein/pc/test/portlet/jsr286/ext/cache/CacheValidationTestCase.java 2011-03-30 09:02:48 UTC (rev 6137)
+++ sandbox/cdi_support/pc/branches/cdi/test/core/src/test/java/org/gatein/pc/test/portlet/jsr286/ext/cache/CacheValidationTestCase.java 2011-03-30 14:47:40 UTC (rev 6140)
@@ -1,274 +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.gatein.pc.test.portlet.jsr286.ext.cache;
-
-import org.gatein.pc.test.portlet.framework.UTP1;
-import org.gatein.pc.test.portlet.framework.UTP2;
-import org.gatein.pc.test.unit.Assertion;
-import org.gatein.pc.test.unit.PortletTestCase;
-import org.gatein.pc.test.unit.PortletTestContext;
-import org.gatein.pc.test.unit.actions.PortletRenderTestAction;
-import org.gatein.pc.test.unit.actions.PortletResourceTestAction;
-import org.gatein.pc.test.unit.annotations.TestCase;
-import org.jboss.unit.Failure;
-import org.jboss.unit.api.Assert;
-import org.jboss.unit.driver.DriverResponse;
-import org.jboss.unit.driver.response.EndTestResponse;
-import org.jboss.unit.driver.response.FailureResponse;
-import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
-
-import javax.portlet.Portlet;
-import javax.portlet.PortletException;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceRequest;
-import javax.portlet.ResourceResponse;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-/**
- * Calling render on the portlet with different render parameters invalidates the cache.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-@TestCase({
- Assertion.EXT_CACHE_VALIDATION
- })
-public class CacheValidationTestCase
-{
-
- /** . */
- private boolean cached;
-
- public CacheValidationTestCase(PortletTestCase seq)
- {
- // Set two seconds of expiration
- seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
- {
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
- {
- cached = true;
-
- //
- response.setContentType("text/html");
- PrintWriter pw = response.getWriter();
- pw.print("foocached");
-
- // Set cache for two seconds with an etag
- response.getCacheControl().setExpirationTime(2);
- response.getCacheControl().setETag("footag");
-
- //
- return null;
- }
- });
- seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
- {
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
- {
- // Trigger a resource so we are sure that the cached portlet will not be part of the whole request
- return new InvokeGetResponse(response.createResourceURL().toString());
- }
- });
-
- //
- seq.bindAction(1, UTP2.RESOURCE_JOIN_POINT, new PortletResourceTestAction()
- {
- @Override
- protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException
- {
- try
- {
- // Wait for one second so the cached content will be aged of 1 second
- Thread.sleep(1000);
-
- // Now render the full page
- return new InvokeGetResponse(response.createRenderURL().toString());
- }
- catch (InterruptedException e)
- {
- return new FailureResponse(Failure.createFailure(e));
- }
- }
- });
-
- // Now make the request to the full page after one second, the goal is to test also an issue whereby the request
- // to the cached content extends the expiration out of the box, as we will wait after that for one second, if that
- // problem occur, then the revalidation would not occur at all
- seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
- {
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
- {
- // Set cached to false to make test fail later
- cached = false;
- return null;
- }
- });
- seq.bindAction(2, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
- {
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
- {
- // Trigger a resource so we are sure that the cached portlet will not be part of the whole request
- return new InvokeGetResponse(response.createResourceURL().toString());
- }
- });
-
- //
- seq.bindAction(3, UTP2.RESOURCE_JOIN_POINT, new PortletResourceTestAction()
- {
- @Override
- protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException
- {
- // Check caching occurred
- Assert.assertTrue(cached);
-
- // Check it contains the cached content
- byte[] bytes = (byte[])context.getPayload().get("http.response.body");
- String cachedMarkup = new String(bytes, "UTF-8");
- Assert.assertTrue("Was expected " + cachedMarkup + " to contain foocached", cachedMarkup.contains("foocached"));
-
- // Wait for one second so the content should have just expired
- try
- {
- Thread.sleep(1000);
- }
- catch (InterruptedException e)
- {
- return new FailureResponse(Failure.createFailure(e));
- }
-
- //
- return new InvokeGetResponse(response.createRenderURL().toString());
- }
- });
-
- // Assert we have the etag and revalidate response for two seconds
- seq.bindAction(4, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
- {
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
- {
- // Check everything is as espected
- Assert.assertEquals("footag", request.getETag());
-
- // Revalidate markup for two seconds and invoke again
- response.getCacheControl().setUseCachedContent(true);
- response.getCacheControl().setExpirationTime(2);
-
- //
- return null;
- }
- });
- seq.bindAction(4, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
- {
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
- {
- // Trigger a resource so we are sure that the cached portlet will not be part of the whole request
- return new InvokeGetResponse(response.createResourceURL().toString());
- }
- });
-
- //
- seq.bindAction(5, UTP2.RESOURCE_JOIN_POINT, new PortletResourceTestAction()
- {
- @Override
- protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException
- {
- try
- {
- // Wait for one second so the cached content will be aged of 1 second
- Thread.sleep(1000);
-
- // Now render the full page
- return new InvokeGetResponse(response.createRenderURL().toString());
- }
- catch (InterruptedException e)
- {
- return new FailureResponse(Failure.createFailure(e));
- }
- }
- });
-
- //
- seq.bindAction(6, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
- {
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
- {
- // Set cached to false to make test fail later
- cached = false;
- return null;
- }
- });
- seq.bindAction(6, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
- {
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
- {
- // Trigger a resource so we are sure that the cached portlet will not be part of the whole request
- // and we can make the 2 seconds pause without messing with the invalid entry we want to revalidate
- return new InvokeGetResponse(response.createResourceURL().toString());
- }
- });
-
- //
- seq.bindAction(7, UTP2.RESOURCE_JOIN_POINT, new PortletResourceTestAction()
- {
- @Override
- protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException
- {
- // Check caching occurred
- Assert.assertTrue(cached);
-
- // Check it contains the cached content
- byte[] bytes = (byte[])context.getPayload().get("http.response.body");
- String cachedMarkup = new String(bytes, "UTF-8");
- Assert.assertTrue("Was expected " + cachedMarkup + " to contain foocached", cachedMarkup.contains("foocached"));
-
- // Wait for one second so the content should have just expired
- try
- {
- Thread.sleep(1000);
- }
- catch (InterruptedException e)
- {
- return new FailureResponse(Failure.createFailure(e));
- }
-
- //
- return new InvokeGetResponse(response.createRenderURL().toString());
- }
- });
-
- // Assert we have the etag and revalidate response for two seconds
- seq.bindAction(8, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
- {
- protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
- {
- // Check everything is as espected
- Assert.assertEquals("footag", request.getETag());
-
- // Finish the test
- return new EndTestResponse();
- }
- });
- }
-}
Copied: sandbox/cdi_support/pc/branches/cdi/test/core/src/test/java/org/gatein/pc/test/portlet/jsr286/ext/cache/CacheValidationTestCase.java (from rev 6137, components/pc/trunk/test/core/src/test/java/org/gatein/pc/test/portlet/jsr286/ext/cache/CacheValidationTestCase.java)
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/core/src/test/java/org/gatein/pc/test/portlet/jsr286/ext/cache/CacheValidationTestCase.java (rev 0)
+++ sandbox/cdi_support/pc/branches/cdi/test/core/src/test/java/org/gatein/pc/test/portlet/jsr286/ext/cache/CacheValidationTestCase.java 2011-03-30 14:47:40 UTC (rev 6140)
@@ -0,0 +1,274 @@
+/******************************************************************************
+ * 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.gatein.pc.test.portlet.jsr286.ext.cache;
+
+import org.gatein.pc.test.portlet.framework.UTP1;
+import org.gatein.pc.test.portlet.framework.UTP2;
+import org.gatein.pc.test.unit.Assertion;
+import org.gatein.pc.test.unit.PortletTestCase;
+import org.gatein.pc.test.unit.PortletTestContext;
+import org.gatein.pc.test.unit.actions.PortletRenderTestAction;
+import org.gatein.pc.test.unit.actions.PortletResourceTestAction;
+import org.gatein.pc.test.unit.annotations.TestCase;
+import org.jboss.unit.Failure;
+import org.jboss.unit.api.Assert;
+import org.jboss.unit.driver.DriverResponse;
+import org.jboss.unit.driver.response.EndTestResponse;
+import org.jboss.unit.driver.response.FailureResponse;
+import org.jboss.unit.remote.driver.handler.http.response.InvokeGetResponse;
+
+import javax.portlet.Portlet;
+import javax.portlet.PortletException;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
+
+/**
+ * Calling render on the portlet with different render parameters invalidates the cache.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+@TestCase({
+ Assertion.EXT_CACHE_VALIDATION
+ })
+public class CacheValidationTestCase
+{
+
+ /** . */
+ private boolean cached;
+
+ public CacheValidationTestCase(PortletTestCase seq)
+ {
+ // Set two seconds of expiration
+ seq.bindAction(0, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
+ {
+ cached = true;
+
+ //
+ response.setContentType("text/html");
+ PrintWriter pw = response.getWriter();
+ pw.print("foocached");
+
+ // Set cache for two seconds with an etag
+ response.getCacheControl().setExpirationTime(2);
+ response.getCacheControl().setETag("footag");
+
+ //
+ return null;
+ }
+ });
+ seq.bindAction(0, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
+ {
+ // Trigger a resource so we are sure that the cached portlet will not be part of the whole request
+ return new InvokeGetResponse(response.createResourceURL().toString());
+ }
+ });
+
+ //
+ seq.bindAction(1, UTP2.RESOURCE_JOIN_POINT, new PortletResourceTestAction()
+ {
+ @Override
+ protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException
+ {
+ try
+ {
+ // Wait for one second so the cached content will be aged of 1 second
+ Thread.sleep(1000);
+
+ // Now render the full page
+ return new InvokeGetResponse(response.createRenderURL().toString());
+ }
+ catch (InterruptedException e)
+ {
+ return new FailureResponse(Failure.createFailure(e));
+ }
+ }
+ });
+
+ // Now make the request to the full page after one second, the goal is to test also an issue whereby the request
+ // to the cached content extends the expiration out of the box, as we will wait after that for one second, if that
+ // problem occur, then the revalidation would not occur at all
+ seq.bindAction(2, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
+ {
+ // Set cached to false to make test fail later
+ cached = false;
+ return null;
+ }
+ });
+ seq.bindAction(2, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
+ {
+ // Trigger a resource so we are sure that the cached portlet will not be part of the whole request
+ return new InvokeGetResponse(response.createResourceURL().toString());
+ }
+ });
+
+ //
+ seq.bindAction(3, UTP2.RESOURCE_JOIN_POINT, new PortletResourceTestAction()
+ {
+ @Override
+ protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException
+ {
+ // Check caching occurred
+ Assert.assertTrue(cached);
+
+ // Check it contains the cached content
+ byte[] bytes = (byte[])context.getPayload().get("http.response.body");
+ String cachedMarkup = new String(bytes, "UTF-8");
+ Assert.assertTrue("Was expected " + cachedMarkup + " to contain foocached", cachedMarkup.contains("foocached"));
+
+ // Wait for one second so the content should have just expired
+ try
+ {
+ Thread.sleep(1000);
+ }
+ catch (InterruptedException e)
+ {
+ return new FailureResponse(Failure.createFailure(e));
+ }
+
+ //
+ return new InvokeGetResponse(response.createRenderURL().toString());
+ }
+ });
+
+ // Assert we have the etag and revalidate response for two seconds
+ seq.bindAction(4, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
+ {
+ // Check everything is as espected
+ Assert.assertEquals("footag", request.getETag());
+
+ // Revalidate markup for two seconds and invoke again
+ response.getCacheControl().setUseCachedContent(true);
+ response.getCacheControl().setExpirationTime(2);
+
+ //
+ return null;
+ }
+ });
+ seq.bindAction(4, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
+ {
+ // Trigger a resource so we are sure that the cached portlet will not be part of the whole request
+ return new InvokeGetResponse(response.createResourceURL().toString());
+ }
+ });
+
+ //
+ seq.bindAction(5, UTP2.RESOURCE_JOIN_POINT, new PortletResourceTestAction()
+ {
+ @Override
+ protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException
+ {
+ try
+ {
+ // Wait for one second so the cached content will be aged of 1 second
+ Thread.sleep(1000);
+
+ // Now render the full page
+ return new InvokeGetResponse(response.createRenderURL().toString());
+ }
+ catch (InterruptedException e)
+ {
+ return new FailureResponse(Failure.createFailure(e));
+ }
+ }
+ });
+
+ //
+ seq.bindAction(6, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
+ {
+ // Set cached to false to make test fail later
+ cached = false;
+ return null;
+ }
+ });
+ seq.bindAction(6, UTP2.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
+ {
+ // Trigger a resource so we are sure that the cached portlet will not be part of the whole request
+ // and we can make the 2 seconds pause without messing with the invalid entry we want to revalidate
+ return new InvokeGetResponse(response.createResourceURL().toString());
+ }
+ });
+
+ //
+ seq.bindAction(7, UTP2.RESOURCE_JOIN_POINT, new PortletResourceTestAction()
+ {
+ @Override
+ protected DriverResponse run(Portlet portlet, ResourceRequest request, ResourceResponse response, PortletTestContext context) throws PortletException, IOException
+ {
+ // Check caching occurred
+ Assert.assertTrue(cached);
+
+ // Check it contains the cached content
+ byte[] bytes = (byte[])context.getPayload().get("http.response.body");
+ String cachedMarkup = new String(bytes, "UTF-8");
+ Assert.assertTrue("Was expected " + cachedMarkup + " to contain foocached", cachedMarkup.contains("foocached"));
+
+ // Wait for one second so the content should have just expired
+ try
+ {
+ Thread.sleep(1000);
+ }
+ catch (InterruptedException e)
+ {
+ return new FailureResponse(Failure.createFailure(e));
+ }
+
+ //
+ return new InvokeGetResponse(response.createRenderURL().toString());
+ }
+ });
+
+ // Assert we have the etag and revalidate response for two seconds
+ seq.bindAction(8, UTP1.RENDER_JOIN_POINT, new PortletRenderTestAction()
+ {
+ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException
+ {
+ // Check everything is as espected
+ Assert.assertEquals("footag", request.getETag());
+
+ // Finish the test
+ return new EndTestResponse();
+ }
+ });
+ }
+}
Modified: sandbox/cdi_support/pc/branches/cdi/test/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-parent</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test</artifactId>
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/jboss42/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/jboss42/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/jboss42/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Alpha01-SNAPSHOT</version>
+ <version>2.3.0-Alpha02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss42</artifactId>
@@ -40,7 +40,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -62,6 +62,10 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -71,10 +75,38 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -134,18 +166,18 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Alpha01-SNAPSHOT</version>
+ <version>2.3.0-Alpha02-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
@@ -378,4 +410,4 @@
<!-- Fix 1.0.3 deployment problems with jboss42 -->
<version.cargo>1.0.2</version.cargo>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/jboss42/src/test/resources/test/remote-jboss-unit.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/jboss42/src/test/resources/test/remote-jboss-unit.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/jboss42/src/test/resources/test/remote-jboss-unit.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -239,6 +239,10 @@
<class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
<property name="archiveId" value="test-jsr286-ext-portletmode.war"/>
</generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-cache.war"/>
+ </generic>
<!--Misc Tests-->
<!--
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/jboss51/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/jboss51/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/jboss51/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss51</artifactId>
@@ -39,7 +39,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -61,6 +61,10 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -70,10 +74,38 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -133,18 +165,18 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
@@ -382,4 +414,4 @@
<!-- Fix 1.0.3 deployment problems with jboss51 deployer-->
<version.cargo>1.0.2</version.cargo>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/jboss51/src/test/resources/test/remote-jboss-unit.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/jboss51/src/test/resources/test/remote-jboss-unit.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/jboss51/src/test/resources/test/remote-jboss-unit.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -239,6 +239,10 @@
<class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
<property name="archiveId" value="test-jsr286-ext-portletmode.war"/>
</generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-cache.war"/>
+ </generic>
<!--Misc Tests-->
<!--
Property changes on: sandbox/cdi_support/pc/branches/cdi/test/servers/jboss6
___________________________________________________________________
Added: svn:ignore
+ target
*.iml
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/jboss6/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/jboss6/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/jboss6/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jboss6</artifactId>
@@ -39,7 +39,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -61,6 +61,10 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -70,10 +74,38 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -133,18 +165,18 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/jboss6/src/test/resources/test/remote-jboss-unit.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/jboss6/src/test/resources/test/remote-jboss-unit.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/jboss6/src/test/resources/test/remote-jboss-unit.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -239,6 +239,10 @@
<class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
<property name="archiveId" value="test-jsr286-ext-portletmode.war"/>
</generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-cache.war"/>
+ </generic>
<!--Misc Tests-->
<!--
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/jetty6/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/jetty6/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/jetty6/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-jetty6</artifactId>
@@ -39,7 +39,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -61,6 +61,10 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -70,10 +74,38 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -139,18 +171,18 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
@@ -379,4 +411,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/jetty6/src/test/resources/test/remote-jboss-unit.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/jetty6/src/test/resources/test/remote-jboss-unit.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/jetty6/src/test/resources/test/remote-jboss-unit.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -239,6 +239,10 @@
<class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
<property name="archiveId" value="test-jsr286-ext-portletmode.war"/>
</generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-cache.war"/>
+ </generic>
<!--Misc Tests-->
<!--
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-servers</artifactId>
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/src/common/resources/common.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/src/common/resources/common.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/src/common/resources/common.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -213,6 +213,7 @@
<package-jsr286-ext-test test="event"/>
<package-jsr286-ext-test test="eventsupport"/>
<package-jsr286-ext-test test="portletmode"/>
+ <package-jsr286-ext-test test="cache"/>
<!-- -->
<copy todir="${target}/test-classes/portlet-test-war/WEB-INF/lib" flatten="true">
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat6/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat6/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat6/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat6</artifactId>
@@ -39,7 +39,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -61,6 +61,10 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -70,10 +74,38 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -133,18 +165,18 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
@@ -373,4 +405,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat6/src/test/resources/test/remote-jboss-unit.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat6/src/test/resources/test/remote-jboss-unit.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat6/src/test/resources/test/remote-jboss-unit.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -239,6 +239,10 @@
<class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
<property name="archiveId" value="test-jsr286-ext-portletmode.war"/>
</generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-cache.war"/>
+ </generic>
<!--Misc Tests-->
<!--
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat7/pom.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat7/pom.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat7/pom.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-servers</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pc-test-tomcat7</artifactId>
@@ -39,7 +39,7 @@
</dependency>
<dependency>
- <groupId>apache-log4j</groupId>
+ <groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
@@ -61,6 +61,10 @@
<groupId>cargo</groupId>
<artifactId>core</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -70,10 +74,39 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-slide</groupId>
+ <artifactId>webdavlib</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </exclusion>
+ </exclusions>
+
</dependency>
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>portal-test-generic</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>hibernate</groupId>
+ <artifactId>hibernate3</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -133,18 +166,18 @@
<dependency>
<groupId>org.gatein.pc</groupId>
<artifactId>pc-test-core</artifactId>
- <version>2.3.0-Alpha02-SNAPSHOT</version>
+ <version>2.3.0-Beta02-SNAPSHOT</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<!-- JSTL for Tomcat -->
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>jstl</artifactId>
</dependency>
<dependency>
- <groupId>apache-taglibs</groupId>
+ <groupId>taglibs</groupId>
<artifactId>standard</artifactId>
</dependency>
@@ -373,4 +406,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat7/src/test/resources/test/remote-jboss-unit.xml
===================================================================
--- sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat7/src/test/resources/test/remote-jboss-unit.xml 2011-03-30 13:02:29 UTC (rev 6139)
+++ sandbox/cdi_support/pc/branches/cdi/test/servers/tomcat7/src/test/resources/test/remote-jboss-unit.xml 2011-03-30 14:47:40 UTC (rev 6140)
@@ -239,6 +239,10 @@
<class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
<property name="archiveId" value="test-jsr286-ext-portletmode.war"/>
</generic>
+ <generic>
+ <class name="org.jboss.unit.remote.driver.RemoteTestDriverClient"/>
+ <property name="archiveId" value="test-jsr286-ext-cache.war"/>
+ </generic>
<!--Misc Tests-->
<!--
13 years, 9 months
- 1
- 0
gatein SVN: r6139 - in epp/portal/branches/EPP_5_1_Branch: component/common/src/main/java/conf/jcr/jbosscache/cluster and 1 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-03-30 09:02:29 -0400 (Wed, 30 Mar 2011)
New Revision: 6139
Modified:
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jbosscache/cluster/config.xml
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml
epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml
Log:
JBEPP-764: Leverage the EAP parameters -g, -u, -m to enable cluster isolation
Modified: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jbosscache/cluster/config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jbosscache/cluster/config.xml 2011-03-30 13:00:48 UTC (rev 6138)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jbosscache/cluster/config.xml 2011-03-30 13:02:29 UTC (rev 6139)
@@ -20,7 +20,7 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
<!-- The cluster name should be changed by the kernel cache configuration -->
- <clustering mode="replication" clusterName="gatein">
+ <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-gatein">
</clustering>
</jbosscache>
\ No newline at end of file
Modified: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2011-03-30 13:00:48 UTC (rev 6138)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/config.xml 2011-03-30 13:02:29 UTC (rev 6139)
@@ -22,7 +22,7 @@
<locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false"
lockAcquisitionTimeout="20000" />
- <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}">
<stateRetrieval timeout="20000" fetchInMemoryState="false" />
<jgroupsConfig multiplexerStack="jcr.stack" />
<sync />
Modified: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml 2011-03-30 13:00:48 UTC (rev 6138)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml 2011-03-30 13:02:29 UTC (rev 6139)
@@ -24,7 +24,7 @@
<!-- Configure the TransactionManager -->
<transaction transactionManagerLookupClass="org.jboss.cache.transaction.JBossStandaloneJTAManagerLookup" />
- <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}">
<stateRetrieval timeout="20000" fetchInMemoryState="false" />
<jgroupsConfig multiplexerStack="jcr.stack" />
<sync />
Modified: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml 2011-03-30 13:00:48 UTC (rev 6138)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/lock-config.xml 2011-03-30 13:02:29 UTC (rev 6139)
@@ -21,7 +21,7 @@
<locking useLockStriping="false" concurrencyLevel="64" lockParentForChildInsertRemove="false" lockAcquisitionTimeout="20000" />
- <clustering mode="replication" clusterName="${jbosscache-cluster-name}">
+ <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-${jbosscache-cluster-name}">
<stateRetrieval timeout="20000" fetchInMemoryState="false" />
<jgroupsConfig multiplexerStack="jcr.stack" />
<sync />
Modified: epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml 2011-03-30 13:00:48 UTC (rev 6138)
+++ epp/portal/branches/EPP_5_1_Branch/component/common/src/main/java/conf/jcr/jbosscache/cluster/udp-mux.xml 2011-03-30 13:02:29 UTC (rev 6139)
@@ -19,7 +19,7 @@
<protocol_stacks>
<stack name="jcr.stack">
<config>
- <UDP mcast_addr="228.10.10.10" mcast_port="45588" tos="8" ucast_recv_buf_size="20000000"
+ <UDP mcast_addr="${jboss.jgroups.udp_async.mcast_addr:228.10.10.10}" mcast_port="${jboss.jgroups.udp_async.mcast_port:45588}" tos="8" ucast_recv_buf_size="20000000"
ucast_send_buf_size="640000" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000" loopback="false"
discard_incompatible_packets="true" max_bundle_size="64000" max_bundle_timeout="30"
use_incoming_packet_handler="true" ip_ttl="2" enable_bundling="true" enable_diagnostics="true"
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml 2011-03-30 13:00:48 UTC (rev 6138)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache-cluster.xml 2011-03-30 13:02:29 UTC (rev 6139)
@@ -1,6 +1,6 @@
<jbosscache xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:jboss:jbosscache-core:config:3.1">
- <clustering mode="replication" clusterName="idm-cluster">
+ <clustering mode="replication" clusterName="${jboss.partition.name:DefaultPartition}-idm-cluster">
<stateRetrieval timeout="20000" fetchInMemoryState="false" />
<jgroupsConfig multiplexerStack="jcr.stack" />
<sync />
13 years, 9 months
- 1
- 0
gatein SVN: r6138 - epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-03-30 09:00:48 -0400 (Wed, 30 Mar 2011)
New Revision: 6138
Modified:
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
Log:
JBEPP-772: Use JndiMultiplexedJBossCacheRegionFactory for IDM second level cache to make switching to TCP easier
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-03-30 09:02:48 UTC (rev 6137)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-03-30 13:00:48 UTC (rev 6138)
@@ -39,7 +39,10 @@
<name>hibernate.properties</name>
<description>Default Hibernate Service</description>
<property name="hibernate.cache.region.jbc2.query.localonly" value="true" />
- <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory" />
+ <property name="hibernate.cache.region.jbc2.cachefactory" value="java:CacheManager"/>
+ <property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.jbc2.JndiMultiplexedJBossCacheRegionFactory" />
+ <!--<property name="hibernate.cache.region.jbc2.query.localonly" value="true" />-->
+ <!--<property name="hibernate.cache.region.factory_class" value="org.hibernate.cache.jbc2.MultiplexedJBossCacheRegionFactory" />-->
<property name="hibernate.transaction.manager_lookup_class" value="org.hibernate.transaction.JBossTransactionManagerLookup" />
<property name="hibernate.show_sql" value="false"/>
<property name="hibernate.current_session_context_class" value="thread"/>
13 years, 9 months
- 1
- 0