[portal-commits] JBoss Portal SVN: r7366 - in trunk: build/ide/intellij/idea60/modules/portlet-server and 1 other directories.
Author: chris.laprun(a)jboss.com
Date: 2007-05-30 18:22:01 -0400 (Wed, 30 May 2007)
New Revision: 7366
Modified:
trunk/build/ide/intellij/idea60/modules/core-cms/core-cms.iml
trunk/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java
Log:
- Fixed compilation problem with MarkupTestCase on JDK 1.4.
- Minor improvements to project files.
Modified: trunk/build/ide/intellij/idea60/modules/core-cms/core-cms.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/core-cms/core-cms.iml 2007-05-30 21:23:17 UTC
(rev 7365)
+++ trunk/build/ide/intellij/idea60/modules/core-cms/core-cms.iml 2007-05-30 22:22:01 UTC
(rev 7366)
@@ -94,6 +94,15 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root
url="jar://$MODULE_DIR$/../../../../../../thirdparty/hibernate/lib/hibernate3.jar!/"
/>
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: trunk/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml 2007-05-30
21:23:17 UTC (rev 7365)
+++ trunk/build/ide/intellij/idea60/modules/portlet-server/portlet-server.iml 2007-05-30
22:22:01 UTC (rev 7366)
@@ -5,6 +5,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../portlet-server">
<sourceFolder
url="file://$MODULE_DIR$/../../../../../../portlet-server/src/main"
isTestSource="false" />
+ <excludeFolder
url="file://$MODULE_DIR$/../../../../../../portlet-server/output" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java 2007-05-30
21:23:17 UTC (rev 7365)
+++
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/MarkupTestCase.java 2007-05-30
22:22:01 UTC (rev 7366)
@@ -491,8 +491,8 @@
MarkupContext markupContext = response.getMarkupContext();
ExtendedAssert.assertNotNull(markupContext);
String markupString = markupContext.getMarkupString();
- ExtendedAssert.assertTrue(markupString.contains("count = " + count));
- ExtendedAssert.assertTrue(markupString.contains("<a
href='wsrp_rewrite?wsrp-urlType=render&wsrp-navigationalState=JBPNS_/wsrp_rewrite'>render</a>"));
+ ExtendedAssert.assertString1ContainsString2(markupString, "count = " +
count);
+ ExtendedAssert.assertString1ContainsString2(markupString, "<a
href='wsrp_rewrite?wsrp-urlType=render&wsrp-navigationalState=JBPNS_/wsrp_rewrite'>render</a>");
// checking session
checkSessionForCurrentlyDeployedPortlet(response);