12:40 a.m.
Author: mwringe
Date: 2009-08-30 01:40:59 -0400 (Sun, 30 Aug 2009)
New Revision: 129
Modified:
components/pc/trunk/api/
components/pc/trunk/bridge/
components/pc/trunk/build/pom.xml
components/pc/trunk/controller/
components/pc/trunk/federation/
components/pc/trunk/jsr168api/
components/pc/trunk/management/
components/pc/trunk/mc/
components/pc/trunk/portal/
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/MimeResponseImpl.java
components/pc/trunk/samples/
components/pc/trunk/test/
components/pc/trunk/test/src/test/build.xml
Log:
Renable JBoss 5 tests. Still have 3 test failures.
Rollback MimeResponseImpl setContentType to get tests running again.
Add some more target directories to svn:ignore.
Property changes on: components/pc/trunk/api
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: components/pc/trunk/bridge
___________________________________________________________________
Name: svn:ignore
+ target
Modified: components/pc/trunk/build/pom.xml
===================================================================
--- components/pc/trunk/build/pom.xml 2009-08-29 21:59:04 UTC (rev 128)
+++ components/pc/trunk/build/pom.xml 2009-08-30 05:40:59 UTC (rev 129)
@@ -41,7 +41,7 @@
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
<version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
<version.jboss.reflect>2.0.2.GA</version.jboss.reflect>
- <version.cargo>1.0-alpha-6</version.cargo>
+ <version.cargo>1.0.1-SNAPSHOT</version.cargo>
<version.junit>3.8.2</version.junit>
<version.ant>1.7.0</version.ant>
<version.sun-jaxb>2.1.4</version.sun-jaxb>
Property changes on: components/pc/trunk/controller
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: components/pc/trunk/federation
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: components/pc/trunk/jsr168api
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: components/pc/trunk/management
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: components/pc/trunk/mc
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: components/pc/trunk/portal
___________________________________________________________________
Name: svn:ignore
+ target
Modified:
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/MimeResponseImpl.java
===================================================================
---
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/MimeResponseImpl.java 2009-08-29
21:59:04 UTC (rev 128)
+++
components/pc/trunk/portlet/src/main/java/org/gatein/pc/portlet/impl/jsr168/api/MimeResponseImpl.java 2009-08-30
05:40:59 UTC (rev 129)
@@ -125,8 +125,11 @@
public void setContentType(String contentType)
{
- responseContent.setContentType(contentType);
- contentTypeSet = true;
+ if (responseContent.getContentType() == null)
+ {
+ responseContent.setContentType(contentType);
+ contentTypeSet = true;
+ }
}
public PrintWriter getWriter() throws IOException
Property changes on: components/pc/trunk/samples
___________________________________________________________________
Name: svn:ignore
+ target
Property changes on: components/pc/trunk/test
___________________________________________________________________
Name: svn:ignore
+ target
Modified: components/pc/trunk/test/src/test/build.xml
===================================================================
--- components/pc/trunk/test/src/test/build.xml 2009-08-29 21:59:04 UTC (rev 128)
+++ components/pc/trunk/test/src/test/build.xml 2009-08-30 05:40:59 UTC (rev 129)
@@ -306,7 +306,7 @@
</and>
</condition>
</fail>
- <!--<fail message="Please set the environment variable
JBOSS_5_0_HOME">
+ <fail message="Please set the environment variable
JBOSS_5_0_HOME">
<condition>
<and>
<not>
@@ -314,7 +314,7 @@
</not>
</and>
</condition>
- </fail>-->
+ </fail>
</target>
<target name="__evaluate_properties.local">
@@ -729,7 +729,7 @@
<echo message="jboss-5.0-shared : ${jboss-5.0-shared-property}"/>
<cargo
- containerId="jboss5x"
+ containerId="jboss51x"
home="${test.jboss-5.0.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
output="${cargo.log.dir}/cargo.${test.id}.server.log"
@@ -753,7 +753,7 @@
<target name="__cargo.jboss-5.0.stop"
depends="__cargo.setup">
<cargo
- containerId="jboss5x"
+ containerId="jboss51x"
home="${test.jboss-5.0.home}"
log="${cargo.log.dir}/cargo.${test.id}.startup.log"
action="stop">
@@ -804,7 +804,7 @@
<target name="tests.jboss">
<antcall target="tests.jboss-4.2"/>
- <!-- <antcall target="tests.jboss-5.0"/> -->
+ <antcall target="tests.jboss-5.0"/>
</target>
<target name="tests.local">
@@ -836,7 +836,7 @@
<configuration>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
- <!--<property name="cargo.jvmargs" value="-Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/>-->
+<!-- <property name="cargo.jvmargs" value="-Xdebug
-Xnoagent -Djava.compiler=NONE
-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9000"/> -->
<deployable type="war"
file="${test.temp.lib}/manager.war"/>
<deployable type="war"
file="${test.temp.lib}/tomcat-6.0/portlet-test.war"/>
</configuration>