gatein SVN: r242 - components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/content.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-03 04:18:17 -0400 (Sat, 03 Oct 2009)
New Revision: 242
Modified:
components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/content/ContentProvider.java
Log:
minor use of parameterized type in return value of ContentProvider
Modified: components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/content/ContentProvider.java
===================================================================
--- components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/content/ContentProvider.java 2009-10-03 07:18:22 UTC (rev 241)
+++ components/mop/trunk/spi/src/main/java/org/gatein/mop/spi/content/ContentProvider.java 2009-10-03 08:18:17 UTC (rev 242)
@@ -34,7 +34,7 @@
* @param contentId the content id
* @return the content state
*/
- GetState getState(String contentId);
+ GetState<S> getState(String contentId);
/**
* Combines several states into a single state representation.
15 years, 2 months
gatein SVN: r240 - components/pc/trunk/test.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2009-10-02 17:42:32 -0400 (Fri, 02 Oct 2009)
New Revision: 240
Modified:
components/pc/trunk/test/pom.xml
Log:
Switch the profile excludes to be on compile and not test compile.
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2009-10-02 21:04:13 UTC (rev 239)
+++ components/pc/trunk/test/pom.xml 2009-10-02 21:42:32 UTC (rev 240)
@@ -187,14 +187,13 @@
<execution>
<goals>
<goal>compile</goal>
- <goal>testCompile</goal>
</goals>
</execution>
</executions>
<configuration>
- <testExcludes>
+ <excludes>
<exclude>org/gatein/pc/test/unit/reports/*</exclude>
- </testExcludes>
+ </excludes>
</configuration>
</plugin>
</plugins>
15 years, 2 months
gatein SVN: r239 - components/pc/trunk/test.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2009-10-02 17:04:13 -0400 (Fri, 02 Oct 2009)
New Revision: 239
Modified:
components/pc/trunk/test/pom.xml
Log:
Update the test pom.xml to include the test profiles from the portlet module.
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2009-10-02 19:02:24 UTC (rev 238)
+++ components/pc/trunk/test/pom.xml 2009-10-02 21:04:13 UTC (rev 239)
@@ -171,6 +171,100 @@
</dependency>
</dependencies>
+ <profiles>
+ <!--By default Annotation Processing Tool related classes need to be disabled-->
+ <profile>
+ <id>default</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>compile</goal>
+ <goal>testCompile</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <testExcludes>
+ <exclude>org/gatein/pc/test/unit/reports/*</exclude>
+ </testExcludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>apt</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>maven-apt-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
+ <force>true</force>
+ <target>1.5</target>
+ <nocompile>true</nocompile>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ <goals>
+ <goal>testExecute</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>tools</artifactId>
+ <version>1.5.0</version>
+ <scope>system</scope>
+ <systemPath>${java.home}/../lib/tools.jar</systemPath>
+ </dependency>
+ </dependencies>
+ </profile>
+ <!--On MacOSX the tools.jar should be already in the classpath-->
+ <profile>
+ <id>apt-mac</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.myfaces.tobago</groupId>
+ <artifactId>maven-apt-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <configuration>
+ <factory>org.gatein.pc.test.unit.reports.TestCaseAPF</factory>
+ <force>true</force>
+ <target>1.5</target>
+ <nocompile>true</nocompile>
+ <showWarnings>true</showWarnings>
+ </configuration>
+ <goals>
+ <goal>testExecute</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
15 years, 2 months
gatein SVN: r238 - in components/wci/trunk/test/src/test/resources/support: jboss-5.1-container-servlet/server-war/WEB-INF and 1 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2009-10-02 15:02:24 -0400 (Fri, 02 Oct 2009)
New Revision: 238
Modified:
components/wci/trunk/test/src/test/resources/support/jboss-4.2-container-servlet/server-war/WEB-INF/web.xml
components/wci/trunk/test/src/test/resources/support/jboss-5.1-container-servlet/server-war/WEB-INF/web.xml
components/wci/trunk/test/src/test/resources/support/tomcat-6.0-container-servlet/server-war/WEB-INF/web.xml
Log:
Fix tests that were failing after the module separation.
Modified: components/wci/trunk/test/src/test/resources/support/jboss-4.2-container-servlet/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/src/test/resources/support/jboss-4.2-container-servlet/server-war/WEB-INF/web.xml 2009-10-02 16:46:12 UTC (rev 237)
+++ components/wci/trunk/test/src/test/resources/support/jboss-4.2-container-servlet/server-war/WEB-INF/web.xml 2009-10-02 19:02:24 UTC (rev 238)
@@ -39,7 +39,7 @@
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
- <servlet-class>org.gatein.wci.impl.tomcat.TC6ContainerServlet</servlet-class>
+ <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet>
Modified: components/wci/trunk/test/src/test/resources/support/jboss-5.1-container-servlet/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/src/test/resources/support/jboss-5.1-container-servlet/server-war/WEB-INF/web.xml 2009-10-02 16:46:12 UTC (rev 237)
+++ components/wci/trunk/test/src/test/resources/support/jboss-5.1-container-servlet/server-war/WEB-INF/web.xml 2009-10-02 19:02:24 UTC (rev 238)
@@ -39,7 +39,7 @@
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
- <servlet-class>org.gatein.wci.impl.tomcat.TC6ContainerServlet</servlet-class>
+ <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
Modified: components/wci/trunk/test/src/test/resources/support/tomcat-6.0-container-servlet/server-war/WEB-INF/web.xml
===================================================================
--- components/wci/trunk/test/src/test/resources/support/tomcat-6.0-container-servlet/server-war/WEB-INF/web.xml 2009-10-02 16:46:12 UTC (rev 237)
+++ components/wci/trunk/test/src/test/resources/support/tomcat-6.0-container-servlet/server-war/WEB-INF/web.xml 2009-10-02 19:02:24 UTC (rev 238)
@@ -39,7 +39,7 @@
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
- <servlet-class>org.gatein.wci.impl.tomcat.TC6ContainerServlet</servlet-class>
+ <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class>
<load-on-startup>0</load-on-startup>
</servlet>
<servlet>
15 years, 2 months
gatein SVN: r237 - in components/pc/trunk: portlet/src/test/java/org/gatein/pc/test/portlet and 6 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-10-02 12:46:12 -0400 (Fri, 02 Oct 2009)
New Revision: 237
Added:
components/pc/trunk/test/src/main/java/org/gatein/pc/test/portlet/
components/pc/trunk/test/src/main/java/org/gatein/pc/test/portlet/framework/
components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit/
components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/
components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168/
components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr286/
components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/session/
Removed:
components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/framework/
components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr168/
components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr286/
components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/session/
components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/unit/
Modified:
components/pc/trunk/test/pom.xml
components/pc/trunk/test/src/test/build.xml
Log:
GTNPC-10 : Move portlet container tests to the test maven module
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2009-10-02 16:33:19 UTC (rev 236)
+++ components/pc/trunk/test/pom.xml 2009-10-02 16:46:12 UTC (rev 237)
@@ -28,12 +28,6 @@
<dependency>
<groupId>org.gatein.pc</groupId>
- <artifactId>pc-portlet</artifactId>
- <type>test-jar</type>
- <classifier>tests</classifier>
- </dependency>
- <dependency>
- <groupId>org.gatein.pc</groupId>
<artifactId>pc-controller</artifactId>
</dependency>
<dependency>
@@ -264,7 +258,6 @@
<property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
<property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
<property name="dependency.portal-portlet-mc.jar" value="${maven.dependency.org.gatein.pc.pc-mc.jar.path}"/>
- <property name="dependency.portal-portlet-tests.test-jar" value="${maven.dependency.org.gatein.pc.pc-portlet.tests.jar.path}"/>
<property name="dependency.portal-portlet-api.jar" value="${maven.dependency.org.gatein.pc.pc-api.jar.path}"/>
<property name="dependency.jboss-unit.jar" value="${maven.dependency.org.jboss.unit.jboss-unit.jar.path}"/>
Copied: components/pc/trunk/test/src/main/java/org/gatein/pc/test/portlet/framework (from rev 234, components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/framework)
Copied: components/pc/trunk/test/src/main/java/org/gatein/pc/test/unit (from rev 234, components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/unit)
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-10-02 16:33:19 UTC (rev 236)
+++ components/pc/trunk/test/src/test/build.xml 2009-10-02 16:46:12 UTC (rev 237)
@@ -45,7 +45,6 @@
<mkdir dir="${test.temp.dir}"/>
<mkdir dir="${test.temp.lib}"/>
- <mkdir dir="${test.temp.portlet}"/>
<mkdir dir="${target}/jboss-unit"/>
<echo message="Preparing environment"/>
@@ -388,19 +387,19 @@
<mkdir dir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/classes"/>
<copy todir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/classes">
<fileset
- dir="${test.temp.portlet}"
+ dir="${target}/test-classes"
includes="org/gatein/pc/test/portlet/@{testsuiteversion}/@{testsuitetype}/common/**"/>
<fileset
- dir="${test.temp.portlet}"
+ dir="${target}/test-classes"
includes="org/gatein/pc/test/portlet/@{testsuiteversion}/common/**"/>
<fileset
- dir="${test.temp.portlet}"
+ dir="${target}/test-classes"
includes="org/gatein/pc/test/portlet/common/**"/>
<fileset
- dir="${test.temp.portlet}"
+ dir="${target}/test-classes"
includes="org/gatein/pc/test/portlet/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}/**"/>
<fileset
- dir="${test.temp.portlet}"
+ dir="${target}/classes"
includes="org/gatein/pc/test/portlet/framework/**"/>
</copy>
<copy todir="${test.temp.dir}/@{testsuiteversion}/@{testsuitetype}/@{testsuitename}-war/WEB-INF/lib">
@@ -420,23 +419,11 @@
<target name="package-tests">
- <echo>------------------------</echo>
- <echo>------------------------</echo>
- <echo>------------------------</echo>
- <echo>------------------------</echo>
- <echo>------------------------</echo>
- <echo>------------------------</echo>
- <echo>------------------------</echo>
- <echo>dependency.portal-portlet-tests.test-jar=${dependency.portal-portlet-tests.test-jar}</echo>
- <echo>dependency.portal-portlet-mc.jar=${dependency.portal-portlet-mc.jar}</echo>
-
- <unjar src="${dependency.portal-portlet-tests.test-jar}" dest="${test.temp.portlet}"/>
-
<!--Portlet test framework lib jar-->
<jar jarfile="${test.temp.lib}/portal-portlet-test-framework-lib.jar">
<!-- -->
- <fileset dir="${test.temp.portlet}" includes="org/gatein/pc/test/unit/**"/>
+ <fileset dir="${target}/classes" includes="org/gatein/pc/test/unit/**"/>
<!-- JSR 168 TLD -->
<zipfileset
Copied: components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr168 (from rev 234, components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr168)
Copied: components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/jsr286 (from rev 234, components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/jsr286)
Copied: components/pc/trunk/test/src/test/java/org/gatein/pc/test/portlet/session (from rev 234, components/pc/trunk/portlet/src/test/java/org/gatein/pc/test/portlet/session)
15 years, 2 months
gatein SVN: r236 - in components/wsrp/trunk: consumer/src/main/java/org/gatein/wsrp/consumer and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-10-02 12:33:19 -0400 (Fri, 02 Oct 2009)
New Revision: 236
Modified:
components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/SessionEvent.java
components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/SessionEventBroadcaster.java
components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/SessionEventListener.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/SessionHandler.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java
Log:
- Improved integration API:
+ Changed SessionEventBroadcaster to an interface.
+ Added event type on SessionEvent.
+ Streamlined SessionEventListener interface.
- Adapted SessionHandler and WSRPConsumerImpl to changes in integration interface.
Modified: components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/SessionEvent.java
===================================================================
--- components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/SessionEvent.java 2009-10-02 16:30:12 UTC (rev 235)
+++ components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/SessionEvent.java 2009-10-02 16:33:19 UTC (rev 236)
@@ -31,5 +31,12 @@
*/
public interface SessionEvent
{
+ enum SessionEventType
+ {
+ SESSION_CREATED, SESSION_DESTROYED
+ }
+
+ SessionEventType getType();
+
HttpSession getSession();
}
Modified: components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/SessionEventBroadcaster.java
===================================================================
--- components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/SessionEventBroadcaster.java 2009-10-02 16:30:12 UTC (rev 235)
+++ components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/SessionEventBroadcaster.java 2009-10-02 16:33:19 UTC (rev 236)
@@ -24,20 +24,14 @@
package org.gatein.wsrp.api;
/**
- * TODO: Implement
- *
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision$
*/
-public class SessionEventBroadcaster
+public interface SessionEventBroadcaster
{
- public void registerListener(String listenerId, SessionEventListener listener)
- {
- throw new UnsupportedOperationException("registerListener");
- }
+ public void registerListener(String listenerId, SessionEventListener listener);
- public void unregisterListener(String listenerId)
- {
- throw new UnsupportedOperationException("unregisterListener");
- }
+ public void unregisterListener(String listenerId);
+
+ public void notifyListenersOf(SessionEvent event);
}
Modified: components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/SessionEventListener.java
===================================================================
--- components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/SessionEventListener.java 2009-10-02 16:30:12 UTC (rev 235)
+++ components/wsrp/trunk/api/src/main/java/org/gatein/wsrp/api/SessionEventListener.java 2009-10-02 16:33:19 UTC (rev 236)
@@ -29,7 +29,5 @@
*/
public interface SessionEventListener
{
- void sessionCreated(SessionEvent event);
-
- void sessionDestroyed(SessionEvent event);
+ void onSessionEvent(SessionEvent event);
}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/SessionHandler.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/SessionHandler.java 2009-10-02 16:30:12 UTC (rev 235)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/SessionHandler.java 2009-10-02 16:33:19 UTC (rev 236)
@@ -390,30 +390,28 @@
// SessionEventListener implementation
- public void sessionCreated(SessionEvent event)
+ public void onSessionEvent(SessionEvent event)
{
- // nothing to do
- }
-
- public void sessionDestroyed(SessionEvent event)
- {
- String id = event.getSession().getId();
-
- // check if the session being destroyed is the one associated with this thread
- ProducerSessionInformation info = RequestHeaderClientHandler.getCurrentProducerSessionInformation();
- if (info != null)
+ if (SessionEvent.SessionEventType.SESSION_DESTROYED.equals(event.getType()))
{
- if (id != null && id.equals(info.getParentSessionId()))
+ String id = event.getSession().getId();
+
+ // check if the session being destroyed is the one associated with this thread
+ ProducerSessionInformation info = RequestHeaderClientHandler.getCurrentProducerSessionInformation();
+ if (info != null)
{
- try
+ if (id != null && id.equals(info.getParentSessionId()))
{
- internalReleaseSessions(info.removeSessions());
+ try
+ {
+ internalReleaseSessions(info.removeSessions());
+ }
+ catch (PortletInvokerException e)
+ {
+ // already logged...
+ }
+ log.debug("Released session '" + id + "' after session was destroyed by Portal.");
}
- catch (PortletInvokerException e)
- {
- // already logged...
- }
- log.debug("Released session '" + id + "' after session was destroyed by Portal.");
}
}
}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2009-10-02 16:30:12 UTC (rev 235)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/WSRPConsumerImpl.java 2009-10-02 16:33:19 UTC (rev 236)
@@ -683,13 +683,8 @@
return getHttpRequest(invocation).getSession();
}
- public void sessionCreated(SessionEvent event)
+ public void onSessionEvent(SessionEvent event)
{
- sessionHandler.sessionCreated(event);
+ sessionHandler.onSessionEvent(event);
}
-
- public void sessionDestroyed(SessionEvent event)
- {
- sessionHandler.sessionDestroyed(event);
- }
}
15 years, 2 months
gatein SVN: r235 - components/wsrp/trunk/wsrp1-ws.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-10-02 12:30:12 -0400 (Fri, 02 Oct 2009)
New Revision: 235
Modified:
components/wsrp/trunk/wsrp1-ws/pom.xml
Log:
- Added javax.jws dependency so that WSRP should build on Java 5.
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2009-10-02 14:56:20 UTC (rev 234)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2009-10-02 16:30:12 UTC (rev 235)
@@ -38,5 +38,10 @@
<groupId>javax.xml.ws</groupId>
<artifactId>jaxws-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>javax.jws</groupId>
+ <artifactId>jsr181-api</artifactId>
+ <version>1.0-MR1</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
15 years, 2 months
gatein SVN: r234 - in components/pc/trunk: docs/user-guide and 5 other directories.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2009-10-02 10:56:20 -0400 (Fri, 02 Oct 2009)
New Revision: 234
Modified:
components/pc/trunk/docs/user-guide/
components/pc/trunk/pom.xml
components/pc/trunk/test/pom.xml
components/pc/trunk/test/src/test/build.xml
components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
components/pc/trunk/test/src/test/resources/test/servers.xml
Log:
Fix the issues that were preventing the JBoss AS 5 tests from running.
Update the tests to use the more recent wci snapshot.
Property changes on: components/pc/trunk/docs/user-guide
___________________________________________________________________
Name: svn:ignore
+ target
Modified: components/pc/trunk/pom.xml
===================================================================
--- components/pc/trunk/pom.xml 2009-10-02 07:52:02 UTC (rev 233)
+++ components/pc/trunk/pom.xml 2009-10-02 14:56:20 UTC (rev 234)
@@ -96,6 +96,11 @@
<artifactId>wci-wci</artifactId>
<version>${version.gatein.wci}</version>
</dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-tomcat</artifactId>
+ <version>${version.gatein.wci}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
Modified: components/pc/trunk/test/pom.xml
===================================================================
--- components/pc/trunk/test/pom.xml 2009-10-02 07:52:02 UTC (rev 233)
+++ components/pc/trunk/test/pom.xml 2009-10-02 14:56:20 UTC (rev 234)
@@ -21,6 +21,10 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.gatein.wci</groupId>
+ <artifactId>wci-tomcat</artifactId>
+ </dependency>
<dependency>
<groupId>org.gatein.pc</groupId>
@@ -254,7 +258,8 @@
<property name="dependency.portal-common-common.jar" value="${maven.dependency.org.gatein.common.common-common.jar.path}"/>
<property name="dependency.portal-common-mc.jar" value="${maven.dependency.org.gatein.common.common-mc.jar.path}"/>
- <property name="dependency.portal-web-web.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
+ <property name="dependency.portal-wci-wci.jar" value="${maven.dependency.org.gatein.wci.wci-wci.jar.path}"/>
+ <property name="dependency.portal-wci-tomcat.jar" value="${maven.dependency.org.gatein.wci.wci-tomcat.jar.path}"/>
<property name="dependency.portal-portlet-portlet.jar" value="${maven.dependency.org.gatein.pc.pc-portlet.jar.path}"/>
<property name="dependency.portal-portlet-controller.jar" value="${maven.dependency.org.gatein.pc.pc-controller.jar.path}"/>
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-10-02 07:52:02 UTC (rev 233)
+++ components/pc/trunk/test/src/test/build.xml 2009-10-02 14:56:20 UTC (rev 234)
@@ -76,7 +76,7 @@
</path>
<path id="portal-web-shared">
- <pathelement path="${dependency.portal-web-web.jar}"/>
+ <pathelement path="${dependency.portal-wci-wci.jar}"/>
</path>
<path id="portal-portlet">
@@ -117,6 +117,7 @@
<path refid="portal-portlet-shared"/>
<path refid="jboss-unit-shared"/>
<path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.portal-wci-tomcat.jar}"/>
</path>
<path id="jboss-5.1">
@@ -133,6 +134,7 @@
<path refid="portal-portlet-shared"/>
<path refid="jboss-unit-shared"/>
<path location="${dependency.ccpp.jar}"/>
+ <path location="${dependency.portal-wci-tomcat.jar}"/>
</path>
<path id="tomcat-6.0">
@@ -161,6 +163,7 @@
<path location="${dependency.jaxb.jar}"/>
<path location="${dependency.ccpp.jar}"/>
<path location="${dependency.jboss-serialization.jar}"/>
+ <path location="${dependency.portal-wci-tomcat.jar}"/>
</path>
<path id="jetty-6.1">
@@ -796,7 +799,7 @@
</antcall>
</target>
- <target name="tests.jboss-5.1" if="JBOSS_5_1_HOME">
+ <target name="tests.jboss-5.1" if="JBOSS_5_1_0_HOME">
<antcall target="tests.jboss-5.1.container-servlet">
<param name="test.id" value="JBoss-5_1-container-servlet"/>
<param name="test.jboss-5.1.name" value="RemoteJBoss_5_1"/>
Modified: components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2009-10-02 07:52:02 UTC (rev 233)
+++ components/pc/trunk/test/src/test/resources/portlet-tck-war/WEB-INF/web.xml 2009-10-02 14:56:20 UTC (rev 234)
@@ -35,7 +35,7 @@
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
- <servlet-class>org.gatein.wci.impl.tomcat.TC6ContainerServlet</servlet-class>
+ <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
Modified: components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2009-10-02 07:52:02 UTC (rev 233)
+++ components/pc/trunk/test/src/test/resources/portlet-test-war/WEB-INF/web.xml 2009-10-02 14:56:20 UTC (rev 234)
@@ -35,7 +35,7 @@
</listener>
<servlet>
<servlet-name>ContainerServlet</servlet-name>
- <servlet-class>org.gatein.wci.impl.tomcat.TC6ContainerServlet</servlet-class>
+ <servlet-class>org.gatein.wci.tomcat.TC6ContainerServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
Modified: components/pc/trunk/test/src/test/resources/test/servers.xml
===================================================================
--- components/pc/trunk/test/src/test/resources/test/servers.xml 2009-10-02 07:52:02 UTC (rev 233)
+++ components/pc/trunk/test/src/test/resources/test/servers.xml 2009-10-02 14:56:20 UTC (rev 234)
@@ -116,7 +116,7 @@
</node>
</server>
<server>
- <server-name>RemoteJBoss_5_0</server-name>
+ <server-name>RemoteJBoss_5_1</server-name>
<node>
<node-id>default</node-id>
<service>
15 years, 2 months
gatein SVN: r233 - in components/wci/trunk: licences and 1 other directory.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2009-10-02 03:52:02 -0400 (Fri, 02 Oct 2009)
New Revision: 233
Added:
components/wci/trunk/licences/
components/wci/trunk/licences/JBossEULA.txt
Removed:
components/wci/trunk/build/
Log:
Cleanup of unused directories
Added: components/wci/trunk/licences/JBossEULA.txt
===================================================================
--- components/wci/trunk/licences/JBossEULA.txt (rev 0)
+++ components/wci/trunk/licences/JBossEULA.txt 2009-10-02 07:52:02 UTC (rev 233)
@@ -0,0 +1,106 @@
+LICENSE AGREEMENT
+JBOSS(r)
+
+This License Agreement governs the use of the Software Packages and any updates to the Software
+Packages, regardless of the delivery mechanism. Each Software Package is a collective work
+under U.S. Copyright Law. Subject to the following terms, Red Hat, Inc. ("Red Hat") grants to
+the user ("Client") a license to the applicable collective work(s) pursuant to the
+GNU Lesser General Public License v. 2.1 except for the following Software Packages:
+(a) JBoss Portal Forums and JBoss Transactions JTS, each of which is licensed pursuant to the
+GNU General Public License v.2;
+
+(b) JBoss Rules, which is licensed pursuant to the Apache License v.2.0;
+
+(c) an optional download for JBoss Cache for the Berkeley DB for Java database, which is licensed under the
+(open source) Sleepycat License (if Client does not wish to use the open source version of this database,
+it may purchase a license from Sleepycat Software);
+
+and (d) the BPEL extension for JBoss jBPM, which is licensed under the Common Public License v.1,
+and, pursuant to the OASIS BPEL4WS standard, requires parties wishing to redistribute to enter various
+royalty-free patent licenses.
+
+Each of the foregoing licenses is available at http://www.opensource.org/licenses/index.php.
+
+1. The Software. "Software Packages" refer to the various software modules that are created and made available
+for distribution by the JBoss.org open source community at http://www.jboss.org. Each of the Software Packages
+may be comprised of hundreds of software components. The end user license agreement for each component is located in
+the component's source code. With the exception of certain image files identified in Section 2 below,
+the license terms for the components permit Client to copy, modify, and redistribute the component,
+in both source code and binary code forms. This agreement does not limit Client's rights under,
+or grant Client rights that supersede, the license terms of any particular component.
+
+2. Intellectual Property Rights. The Software Packages are owned by Red Hat and others and are protected under copyright
+and other laws. Title to the Software Packages and any component, or to any copy, modification, or merged portion shall
+remain with the aforementioned, subject to the applicable license. The "JBoss" trademark, "Red Hat" trademark, the
+individual Software Package trademarks, and the "Shadowman" logo are registered trademarks of Red Hat and its affiliates
+in the U.S. and other countries. This agreement permits Client to distribute unmodified copies of the Software Packages
+using the Red Hat trademarks that Red Hat has inserted in the Software Packages on the condition that Client follows Red Hat's
+trademark guidelines for those trademarks located at http://www.redhat.com/about/corporate/trademark/. Client must abide by
+these trademark guidelines when distributing the Software Packages, regardless of whether the Software Packages have been modified.
+If Client modifies the Software Packages, then Client must replace all Red Hat trademarks and logos identified at
+http://www.jboss.com/company/logos, unless a separate agreement with Red Hat is executed or other permission granted.
+Merely deleting the files containing the Red Hat trademarks may corrupt the Software Packages.
+
+3. Limited Warranty. Except as specifically stated in this Paragraph 3 or a license for a particular
+component, to the maximum extent permitted under applicable law, the Software Packages and the
+components are provided and licensed "as is" without warranty of any kind, expressed or implied,
+including the implied warranties of merchantability, non-infringement or fitness for a particular purpose.
+Red Hat warrants that the media on which Software Packages may be furnished will be free from defects in
+materials and manufacture under normal use for a period of 30 days from the date of delivery to Client.
+Red Hat does not warrant that the functions contained in the Software Packages will meet Client's requirements
+or that the operation of the Software Packages will be entirely error free or appear precisely as described
+in the accompanying documentation. This warranty extends only to the party that purchases the Services
+pertaining to the Software Packages from Red Hat or a Red Hat authorized distributor.
+
+4. Limitation of Remedies and Liability. To the maximum extent permitted by applicable law, the remedies
+described below are accepted by Client as its only remedies. Red Hat's entire liability, and Client's
+exclusive remedies, shall be: If the Software media is defective, Client may return it within 30 days of
+delivery along with a copy of Client's payment receipt and Red Hat, at its option, will replace it or
+refund the money paid by Client for the Software. To the maximum extent permitted by applicable law,
+Red Hat or any Red Hat authorized dealer will not be liable to Client for any incidental or consequential
+damages, including lost profits or lost savings arising out of the use or inability to use the Software,
+even if Red Hat or such dealer has been advised of the possibility of such damages. In no event shall
+Red Hat's liability under this agreement exceed the amount that Client paid to Red Hat under this
+Agreement during the twelve months preceding the action.
+
+5. Export Control. As required by U.S. law, Client represents and warrants that it:
+(a) understands that the Software Packages are subject to export controls under the
+U.S. Commerce Department's Export Administration Regulations ("EAR");
+
+(b) is not located in a prohibited destination country under the EAR or U.S. sanctions regulations
+(currently Cuba, Iran, Iraq, Libya, North Korea, Sudan and Syria);
+
+(c) will not export, re-export, or transfer the Software Packages to any prohibited destination, entity,
+or individual without the necessary export license(s) or authorizations(s) from the U.S. Government;
+
+(d) will not use or transfer the Software Packages for use in any sensitive nuclear, chemical or
+biological weapons, or missile technology end-uses unless authorized by the U.S. Government by
+regulation or specific license;
+
+(e) understands and agrees that if it is in the United States and exports or transfers the Software
+Packages to eligible end users, it will, as required by EAR Section 740.17(e), submit semi-annual
+reports to the Commerce Department's Bureau of Industry & Security (BIS), which include the name and
+address (including country) of each transferee;
+
+and (f) understands that countries other than the United States may restrict the import, use, or
+export of encryption products and that it shall be solely responsible for compliance with any such
+import, use, or export restrictions.
+
+6. Third Party Programs. Red Hat may distribute third party software programs with the Software Packages
+that are not part of the Software Packages and which Client must install separately. These third party
+programs are subject to their own license terms. The license terms either accompany the programs or
+can be viewed at http://www.redhat.com/licenses/. If Client does not agree to abide by the applicable
+license terms for such programs, then Client may not install them. If Client wishes to install the programs
+on more than one system or transfer the programs to another party, then Client must contact the licensor
+of the programs.
+
+7. General. If any provision of this agreement is held to be unenforceable, that shall not affect the
+enforceability of the remaining provisions. This License Agreement shall be governed by the laws of the
+State of North Carolina and of the United States, without regard to any conflict of laws provisions,
+except that the United Nations Convention on the International Sale of Goods shall not apply.
+
+Copyright 2006 Red Hat, Inc. All rights reserved.
+"JBoss" and the JBoss logo are registered trademarks of Red Hat, Inc.
+All other trademarks are the property of their respective owners.
+
+ Page 1 of 1 18 October 2006
15 years, 2 months