September 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r8305 - modules/portlet/trunk/build.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-17 20:10:43 -0400 (Mon, 17 Sep 2007) New Revision: 8305 Modified: modules/portlet/trunk/build/build.xml Log: include test sub module when building portlet module Modified: modules/portlet/trunk/build/build.xml =================================================================== --- modules/portlet/trunk/build/build.xml 2007-09-17 23:49:30 UTC (rev 8304) +++ modules/portlet/trunk/build/build.xml 2007-09-18 00:10:43 UTC (rev 8305) @@ -122,6 +122,11 @@ <group name="portlet"> <include + modules="jsr168api,portlet,test,federation,management,bridge"/> + </group> + + <group name="portlet-1.4"> + <include modules="jsr168api,portlet,federation,management,bridge"/> </group>

18 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r8304 - modules/portlet/trunk.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-17 19:49:30 -0400 (Mon, 17 Sep 2007) New Revision: 8304 Removed: modules/portlet/trunk/jboss-portal-portlet.iws Log: removed misplaced idea file Deleted: modules/portlet/trunk/jboss-portal-portlet.iws =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-17 23:46:53 UTC (rev 8303) +++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-17 23:49:30 UTC (rev 8304) @@ -1,1480 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project version="4" relativePaths="false"> - <component name="BookmarkManager" /> - <component name="ChangeBrowserSettings"> - <option name="MAIN_SPLITTER_PROPORTION" value="0.3" /> - <option name="MESSAGES_SPLITTER_PROPORTION" value="0.8" /> - <option name="USE_DATE_BEFORE_FILTER" value="false" /> - <option name="USE_DATE_AFTER_FILTER" value="false" /> - <option name="USE_CHANGE_BEFORE_FILTER" value="false" /> - <option name="USE_CHANGE_AFTER_FILTER" value="false" /> - <option name="DATE_BEFORE" value="" /> - <option name="DATE_AFTER" value="" /> - <option name="CHANGE_BEFORE" value="" /> - <option name="CHANGE_AFTER" value="" /> - <option name="USE_USER_FILTER" value="false" /> - <option name="USER" value="" /> - </component> - <component name="ChangeListManager"> - <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/build.xml" afterPath="$PROJECT_DIR$/test/build.xml" /> - </list> - </component> - <component name="ChangeListSynchronizer" /> - <component name="ChangesViewManager" flattened_view="true" /> - <component name="CheckinPanelState" /> - <component name="Commander"> - <leftPanel /> - <rightPanel /> - <splitter proportion="0.5" /> - </component> - <component name="CompilerWorkspaceConfiguration"> - <option name="COMPILE_IN_BACKGROUND" value="false" /> - <option name="AUTO_SHOW_ERRORS_IN_EDITOR" value="true" /> - <option name="CLOSE_MESSAGE_VIEW_IF_SUCCESS" value="true" /> - <option name="COMPILE_DEPENDENT_FILES" value="false" /> - <option name="CLEAR_OUTPUT_DIRECTORY" value="false" /> - <option name="ASSERT_NOT_NULL" value="true" /> - </component> - <component name="CoverageDataManager" /> - <component name="Cvs2Configuration"> - <option name="PRUNE_EMPTY_DIRECTORIES" value="true" /> - <option name="MERGING_MODE" value="0" /> - <option name="MERGE_WITH_BRANCH1_NAME" value="HEAD" /> - <option name="MERGE_WITH_BRANCH2_NAME" value="HEAD" /> - <option name="RESET_STICKY" value="false" /> - <option name="CREATE_NEW_DIRECTORIES" value="true" /> - <option name="DEFAULT_TEXT_FILE_SUBSTITUTION" value="kv" /> - <option name="PROCESS_UNKNOWN_FILES" value="false" /> - <option name="PROCESS_DELETED_FILES" value="false" /> - <option name="PROCESS_IGNORED_FILES" value="false" /> - <option name="RESERVED_EDIT" value="false" /> - <option name="CHECKOUT_DATE_OR_REVISION_SETTINGS"> - <value> - <option name="BRANCH" value="" /> - <option name="DATE" value="" /> - <option name="USE_BRANCH" value="false" /> - <option name="USE_DATE" value="false" /> - </value> - </option> - <option name="UPDATE_DATE_OR_REVISION_SETTINGS"> - <value> - <option name="BRANCH" value="" /> - <option name="DATE" value="" /> - <option name="USE_BRANCH" value="false" /> - <option name="USE_DATE" value="false" /> - </value> - </option> - <option name="SHOW_CHANGES_REVISION_SETTINGS"> - <value> - <option name="BRANCH" value="" /> - <option name="DATE" value="" /> - <option name="USE_BRANCH" value="false" /> - <option name="USE_DATE" value="false" /> - </value> - </option> - <option name="SHOW_OUTPUT" value="false" /> - <option name="ADD_WATCH_INDEX" value="0" /> - <option name="REMOVE_WATCH_INDEX" value="0" /> - <option name="UPDATE_KEYWORD_SUBSTITUTION" /> - <option name="MAKE_NEW_FILES_READONLY" value="false" /> - <option name="SHOW_CORRUPTED_PROJECT_FILES" value="0" /> - <option name="TAG_AFTER_PROJECT_COMMIT" value="false" /> - <option name="OVERRIDE_EXISTING_TAG_FOR_PROJECT" value="true" /> - <option name="TAG_AFTER_PROJECT_COMMIT_NAME" value="" /> - <option name="CLEAN_COPY" value="false" /> - </component> - <component name="DaemonCodeAnalyzer"> - <disable_hints /> - </component> - <component name="DebuggerManager"> - <line_breakpoints> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java" line="61" class="Class at PortletConfigSequenceBuilder.java:61" package="org.jboss.portal.test.portlet.jsr168.api.portletconfig"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java" line="79" class="Class at PortletConfigSequenceBuilder.java:79" package="org.jboss.portal.test.portlet.jsr168.api.portletconfig"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java" line="102" class="Class at PortletConfigSequenceBuilder.java:102" package="org.jboss.portal.test.portlet.jsr168.api.portletconfig"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java" line="141" class="Class at PortletConfigSequenceBuilder.java:141" package="org.jboss.portal.test.portlet.jsr168.api.portletconfig"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portletconfig/PortletConfigSequenceBuilder.java" line="160" class="Class at PortletConfigSequenceBuilder.java:160" package="org.jboss.portal.test.portlet.jsr168.api.portletconfig"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/test/src/main/org/jboss/portal/portlet/test/StringCodecTestCase.java" line="53" class="org.jboss.portal.portlet.test.StringCodecTestCase" package="org.jboss.portal.portlet.test"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java" line="108" class="Class at PortletRequestsSequenceBuilder.java:108" package="org.jboss.portal.test.portlet.jsr168.tck.portletrequests"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java" line="118" class="Class at PortletRequestsSequenceBuilder.java:118" package="org.jboss.portal.test.portlet.jsr168.tck.portletrequests"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java" line="128" class="Class at PortletRequestsSequenceBuilder.java:128" package="org.jboss.portal.test.portlet.jsr168.tck.portletrequests"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java" line="150" class="Class at PortletRequestsSequenceBuilder.java:150" package="org.jboss.portal.test.portlet.jsr168.tck.portletrequests"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java" line="163" class="Class at PortletRequestsSequenceBuilder.java:163" package="org.jboss.portal.test.portlet.jsr168.tck.portletrequests"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java" line="177" class="Class at PortletRequestsSequenceBuilder.java:177" package="org.jboss.portal.test.portlet.jsr168.tck.portletrequests"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java" line="185" class="Class at PortletRequestsSequenceBuilder.java:185" package="org.jboss.portal.test.portlet.jsr168.tck.portletrequests"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletrequests/PortletRequestsSequenceBuilder.java" line="199" class="Class at PortletRequestsSequenceBuilder.java:199" package="org.jboss.portal.test.portlet.jsr168.tck.portletrequests"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java" line="336" class="Class at PortletInterfaceSequenceBuilder.java:336" package="org.jboss.portal.test.portlet.jsr168.tck.portletinterface"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java" line="344" class="Class at PortletInterfaceSequenceBuilder.java:344" package="org.jboss.portal.test.portlet.jsr168.tck.portletinterface"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java" line="353" class="Class at PortletInterfaceSequenceBuilder.java:353" package="org.jboss.portal.test.portlet.jsr168.tck.portletinterface"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletinterface/PortletInterfaceSequenceBuilder.java" line="362" class="Class at PortletInterfaceSequenceBuilder.java:362" package="org.jboss.portal.test.portlet.jsr168.tck.portletinterface"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java" line="137" class="org.jboss.portal.test.framework.portlet.PortletTestDriver" package="org.jboss.portal.test.framework.portlet"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java" line="142" class="org.jboss.portal.test.framework.portlet.PortletTestDriver" package="org.jboss.portal.test.framework.portlet"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java" line="117" class="Class at ExpiringCacheSequenceBuilder.java:117" package="org.jboss.portal.test.portlet.jsr168.ext.expiringcache"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java" line="126" class="Class at ExpiringCacheSequenceBuilder.java:126" package="org.jboss.portal.test.portlet.jsr168.ext.expiringcache"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java" line="103" class="Class at ExpiringCacheSequenceBuilder.java:103" package="org.jboss.portal.test.portlet.jsr168.ext.expiringcache"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java" line="139" class="Class at ExpiringCacheSequenceBuilder.java:139" package="org.jboss.portal.test.portlet.jsr168.ext.expiringcache"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java" line="149" class="Class at ExpiringCacheSequenceBuilder.java:149" package="org.jboss.portal.test.portlet.jsr168.ext.expiringcache"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java" line="170" class="Class at ExpiringCacheSequenceBuilder.java:170" package="org.jboss.portal.test.portlet.jsr168.ext.expiringcache"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java" line="186" class="Class at ExpiringCacheSequenceBuilder.java:186" package="org.jboss.portal.test.portlet.jsr168.ext.expiringcache"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java" line="199" class="Class at ExpiringCacheSequenceBuilder.java:199" package="org.jboss.portal.test.portlet.jsr168.ext.expiringcache"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java" line="208" class="Class at ExpiringCacheSequenceBuilder.java:208" package="org.jboss.portal.test.portlet.jsr168.ext.expiringcache"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java" line="221" class="Class at ExpiringCacheSequenceBuilder.java:221" package="org.jboss.portal.test.portlet.jsr168.ext.expiringcache"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java" line="231" class="Class at ExpiringCacheSequenceBuilder.java:231" package="org.jboss.portal.test.portlet.jsr168.ext.expiringcache"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java" line="252" class="Class at ExpiringCacheSequenceBuilder.java:252" package="org.jboss.portal.test.portlet.jsr168.ext.expiringcache"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java" line="138" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor" package="org.jboss.portal.portlet.aspects.portlet"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="337" class="Class at AbstractCacheSequenceBuilder.java:337" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="351" class="Class at AbstractCacheSequenceBuilder.java:351" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="360" class="Class at AbstractCacheSequenceBuilder.java:360" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="370" class="Class at AbstractCacheSequenceBuilder.java:370" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="378" class="Class at AbstractCacheSequenceBuilder.java:378" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="193" class="Class at AbstractCacheSequenceBuilder.java:193" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="209" class="Class at AbstractCacheSequenceBuilder.java:209" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="218" class="Class at AbstractCacheSequenceBuilder.java:218" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="227" class="Class at AbstractCacheSequenceBuilder.java:227" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="235" class="Class at AbstractCacheSequenceBuilder.java:235" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="249" class="Class at AbstractCacheSequenceBuilder.java:249" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="263" class="Class at AbstractCacheSequenceBuilder.java:263" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="272" class="Class at AbstractCacheSequenceBuilder.java:272" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="281" class="Class at AbstractCacheSequenceBuilder.java:281" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="292" class="Class at AbstractCacheSequenceBuilder.java:292" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java" line="307" class="Class at AbstractCacheSequenceBuilder.java:307" package="org.jboss.portal.test.portlet.jsr168.ext.common"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java" line="57" class="org.jboss.portal.portlet.aspects.portlet.ConsumerCacheInterceptor" package="org.jboss.portal.portlet.aspects.portlet"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java" line="267" class="org.jboss.portal.test.portlet.state.AbstractStatefulPortletInvokerTestCase" package="org.jboss.portal.test.portlet.state"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java" line="290" class="org.jboss.portal.test.portlet.state.AbstractStatefulPortletInvokerTestCase" package="org.jboss.portal.test.portlet.state"> - <option name="ENABLED" value="true" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - </line_breakpoints> - <breakpoint_any> - <breakpoint> - <option name="NOTIFY_CAUGHT" value="true" /> - <option name="NOTIFY_UNCAUGHT" value="true" /> - <option name="ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - <breakpoint> - <option name="NOTIFY_CAUGHT" value="true" /> - <option name="NOTIFY_UNCAUGHT" value="true" /> - <option name="ENABLED" value="false" /> - <option name="SUSPEND_POLICY" value="SuspendAll" /> - <option name="LOG_ENABLED" value="false" /> - <option name="LOG_EXPRESSION_ENABLED" value="false" /> - <option name="COUNT_FILTER_ENABLED" value="false" /> - <option name="COUNT_FILTER" value="0" /> - <option name="CONDITION_ENABLED" value="false" /> - <option name="CLASS_FILTERS_ENABLED" value="false" /> - <option name="INSTANCE_FILTERS_ENABLED" value="false" /> - <option name="CONDITION" value="" /> - <option name="LOG_MESSAGE" value="" /> - </breakpoint> - </breakpoint_any> - <breakpoint_rules /> - <ui_properties /> - </component> - <component name="ErrorTreeViewConfiguration"> - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="HIDE_WARNINGS" value="false" /> - </component> - <component name="FavoritesManager"> - <favorites_list name="jboss-portal-portlet" /> - </component> - <component name="FavoritesProjectViewPane"> - <subPane subId="jboss-portal-portlet"> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" /> - <option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" /> - </PATH_ELEMENT> - </PATH> - </subPane> - </component> - <component name="FileEditorManager"> - <leaf> - <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/test/build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="402" column="63" selection-start="19358" selection-end="19358" vertical-scroll-proportion="0.3329223"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="buildmagic.ent" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> - <provider selected="true" editor-type-id="text-editor"> - <state line="840" column="0" selection-start="31597" selection-end="31597" vertical-scroll-proportion="0.015075377"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="155" column="0" selection-start="6302" selection-end="6302" vertical-scroll-proportion="0.94081384"> - <folding /> - </state> - </provider> - </entry> - </file> - </leaf> - </component> - <component name="FindManager"> - <FindUsagesManager> - <setting name="OPEN_NEW_TAB" value="false" /> - </FindUsagesManager> - </component> - <component name="HierarchyBrowserManager"> - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="SORT_ALPHABETICALLY" value="false" /> - <option name="HIDE_CLASSES_WHERE_METHOD_NOT_IMPLEMENTED" value="false" /> - </component> - <component name="InspectionManager"> - <option name="AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="SPLITTER_PROPORTION" value="0.5" /> - <option name="GROUP_BY_SEVERITY" value="false" /> - <option name="FILTER_RESOLVED_ITEMS" value="true" /> - <option name="ANALYZE_TEST_SOURCES" value="true" /> - <option name="SHOW_DIFF_WITH_PREVIOUS_RUN" value="false" /> - <option name="SCOPE_TYPE" value="1" /> - <option name="CUSTOM_SCOPE_NAME" value="" /> - <option name="SHOW_ONLY_DIFF" value="false" /> - <option name="myCurrentProfileName" value="Default" /> - </component> - <component name="J2EEProjectPane" /> - <component name="JspContextManager" /> - <component name="ModuleEditorState"> - <option name="LAST_EDITED_MODULE_NAME" /> - <option name="LAST_EDITED_TAB_NAME" /> - </component> - <component name="NamedScopeManager" /> - <component name="PackagesPane"> - <subPane> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - </subPane> - </component> - <component name="PerforceChangeBrowserSettings"> - <option name="USE_CLIENT_FILTER" value="true" /> - <option name="CLIENT" value="" /> - </component> - <component name="PerforceDirect.Settings"> - <option name="useP4CONFIG" value="true" /> - <option name="port" value="<perforce_server>:1666" /> - <option name="client" value="" /> - <option name="user" value="" /> - <option name="passwd" value="" /> - <option name="showCmds" value="false" /> - <option name="useNativeApi" value="false" /> - <option name="pathToExec" value="p4" /> - <option name="useCustomPathToExec" value="false" /> - <option name="SYNC_FORCE" value="false" /> - <option name="SYNC_RUN_RESOLVE" value="true" /> - <option name="REVERT_UNCHANGED_FILES" value="true" /> - <option name="CHARSET" value="none" /> - <option name="SHOW_BRANCHES_HISTORY" value="true" /> - <option name="ENABLED" value="true" /> - <option name="USE_LOGIN" value="false" /> - <option name="LOGIN_SILENTLY" value="false" /> - <option name="INTEGRATE_RUN_RESOLVE" value="true" /> - <option name="INTEGRATE_REVERT_UNCHANGED" value="true" /> - <option name="SERVER_TIMEOUT" value="20000" /> - </component> - <component name="ProjectLevelVcsManager"> - <OptionsSetting value="true" id="Add" /> - <OptionsSetting value="true" id="Remove" /> - <OptionsSetting value="true" id="Checkin" /> - <OptionsSetting value="true" id="Checkout" /> - <OptionsSetting value="true" id="Update" /> - <OptionsSetting value="true" id="Status" /> - <OptionsSetting value="true" id="Edit" /> - <OptionsSetting value="true" id="Undo Check Out" /> - <OptionsSetting value="true" id="Compare with SourceSafe Version" /> - <OptionsSetting value="true" id="Get Latest Version" /> - <ConfirmationsSetting value="0" id="Add" /> - <ConfirmationsSetting value="0" id="Remove" /> - </component> - <component name="ProjectPane"> - <subPane> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc/buildfragments" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - </subPane> - </component> - <component name="ProjectReloadState"> - <option name="STATE" value="0" /> - </component> - <component name="ProjectView"> - <navigator currentView="ProjectPane" proportions="0.11111111" version="1" splitterProportion="0.5"> - <flattenPackages /> - <showMembers /> - <showModules /> - <showLibraryContents /> - <hideEmptyPackages /> - <abbreviatePackageNames /> - <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" /> - <autoscrollToSource /> - <autoscrollFromSource /> - <sortByType /> - </navigator> - </component> - <component name="PropertiesComponent"> - <property name="MemberChooser.copyJavadoc" value="false" /> - <property name="GoToClass.includeLibraries" value="false" /> - <property name="MemberChooser.showClasses" value="true" /> - <property name="MemberChooser.sorted" value="false" /> - <property name="RunManagerConfig.compileBeforeRunning" value="false" /> - <property name="GoToFile.includeJavaFiles" value="false" /> - <property name="GoToClass.toSaveIncludeLibraries" value="false" /> - <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> - </component> - <component name="ReadonlyStatusHandler"> - <option name="SHOW_DIALOG" value="true" /> - </component> - <component name="RecentsManager"> - <key name="CopyClassDialog.RECENTS_KEY"> - <recent name="org.jboss.portal.portlet.impl.state.consumer" /> - <recent name="org.jboss.portal.portlet.test" /> - <recent name="org.jboss.portal.portlet.registry" /> - </key> - <key name="MoveClassesOrPackagesDialog.RECENTS_KEY"> - <recent name="org.jboss.portal.portlet" /> - <recent name="org.jboss.portal" /> - <recent name="org.jboss.portal.portlet.management" /> - <recent name="org.jboss.portal.portlet.test.deployment" /> - <recent name="org.jboss.portal.test.portlet.state" /> - </key> - </component> - <component name="RestoreUpdateTree" /> - <component name="RunManager" selected="Remote.Runner"> - <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ADDITIONAL_CLASS_PATH" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="wholeProject" /> - </option> - <method> - <option name="Make" value="true" /> - </method> - </configuration> - <configuration default="true" type="Applet" factoryName="Applet"> - <module name="" /> - <option name="MAIN_CLASS_NAME" /> - <option name="HTML_FILE_NAME" /> - <option name="HTML_USED" value="false" /> - <option name="WIDTH" value="400" /> - <option name="HEIGHT" value="300" /> - <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" /> - <option name="VM_PARAMETERS" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - </configuration> - <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false"> - <option name="MAIN_CLASS_NAME" /> - <option name="VM_PARAMETERS" /> - <option name="PROGRAM_PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="ENABLE_SWING_INSPECTOR" value="false" /> - <module name="" /> - </configuration> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> - </configuration> - <configuration default="false" name="Tomcat" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="8000" /> - <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="8000" /> - <option name="TRANSPORT" value="0" /> - <option name="LOCAL" value="false" /> - </RunnerSettings> - <RunnerSettings RunnerId="JProfiler"> - <option name="WINDOW" value="false" /> - <option name="JVMPI" value="false" /> - <option name="INTERPRETED" value="false" /> - </RunnerSettings> - <ConfigurationWrapper RunnerId="Debug" /> - <method> - <option name="Make" value="true" /> - </method> - </configuration> - <configuration default="false" name="Runner" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="7878" /> - <RunnerSettings RunnerId="Debug"> - <option name="DEBUG_PORT" value="7878" /> - <option name="TRANSPORT" value="0" /> - <option name="LOCAL" value="false" /> - </RunnerSettings> - <RunnerSettings RunnerId="JProfiler"> - <option name="WINDOW" value="false" /> - <option name="JVMPI" value="false" /> - <option name="INTERPRETED" value="false" /> - </RunnerSettings> - <ConfigurationWrapper RunnerId="Debug" /> - <method> - <option name="Make" value="true" /> - </method> - </configuration> - <configuration name="<template>" type="WebApp" default="true" selected="false"> - <Host>localhost</Host> - <Port>5050</Port> - </configuration> - </component> - <component name="ScopeViewComponent"> - <subPane subId="Project"> - <PATH> - <PATH_ELEMENT USER_OBJECT="Root"> - <option name="myItemId" value="" /> - <option name="myItemType" value="" /> - </PATH_ELEMENT> - </PATH> - </subPane> - </component> - <component name="SelectInManager" /> - <component name="StarteamConfiguration"> - <option name="SERVER" value="" /> - <option name="PORT" value="49201" /> - <option name="USER" value="" /> - <option name="PASSWORD" value="" /> - <option name="PROJECT" value="" /> - <option name="VIEW" value="" /> - <option name="ALTERNATIVE_WORKING_PATH" value="" /> - <option name="LOCK_ON_CHECKOUT" value="false" /> - <option name="UNLOCK_ON_CHECKIN" value="false" /> - </component> - <component name="StructuralSearchPlugin" /> - <component name="StructureViewFactory"> - <option name="AUTOSCROLL_MODE" value="true" /> - <option name="AUTOSCROLL_FROM_SOURCE" value="false" /> - <option name="ACTIVE_ACTIONS" value="" /> - </component> - <component name="Struts Assistant"> - <option name="showInputs" value="true" /> - <option name="resources"> - <value> - <option name="strutsPath" /> - <option name="strutsHelp" /> - </value> - </option> - <option name="selectedTaglibs" /> - <option name="selectedTaglibs" /> - <option name="myStrutsValidationEnabled" value="true" /> - <option name="myTilesValidationEnabled" value="true" /> - <option name="myValidatorValidationEnabled" value="true" /> - <option name="myReportErrorsAsWarnings" value="true" /> - </component> - <component name="SvnChangesBrowserSettings"> - <option name="USE_AUTHOR_FIELD" value="true" /> - <option name="AUTHOR" value="" /> - <option name="LOCATION" value="" /> - <option name="USE_PROJECT_SETTINGS" value="true" /> - <option name="USE_ALTERNATE_LOCATION" value="false" /> - </component> - <component name="SvnConfiguration"> - <option name="USER" value="" /> - <option name="PASSWORD" value="" /> - <option name="PROCESS_UNRESOLVED" value="false" /> - <option name="LAST_MERGED_REVISION" /> - <option name="UPDATE_RUN_STATUS" value="false" /> - <option name="UPDATE_RECURSIVELY" value="true" /> - <option name="MERGE_DRY_RUN" value="false" /> - <configuration useDefault="false">/Users/julien/.subversion</configuration> - <upgradeMode>none</upgradeMode> - </component> - <component name="TodoView" selected-index="0"> - <todo-panel id="selected-file"> - <are-packages-shown value="false" /> - <are-modules-shown value="false" /> - <flatten-packages value="false" /> - <is-autoscroll-to-source value="true" /> - </todo-panel> - <todo-panel id="all"> - <are-packages-shown value="true" /> - <are-modules-shown value="false" /> - <flatten-packages value="false" /> - <is-autoscroll-to-source value="true" /> - </todo-panel> - </component> - <component name="ToolWindowManager"> - <frame x="24" y="24" width="1680" height="958" extended-state="0" /> - <editor active="true" /> - <layout> - <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Maven-2 Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.329859" order="0" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.329849" order="1" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.329849" order="8" /> - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" /> - <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" /> - <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> - <window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3786295" order="4" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> - <window_info id="JProfiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" /> - <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> - <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" /> - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" /> - <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - </layout> - </component> - <component name="VCS.FileViewConfiguration"> - <option name="SELECTED_STATUSES" value="DEFAULT" /> - <option name="SELECTED_COLUMNS" value="DEFAULT" /> - <option name="SHOW_FILTERS" value="true" /> - <option name="CUSTOMIZE_VIEW" value="true" /> - <option name="SHOW_FILE_HISTORY_AS_TREE" value="true" /> - </component> - <component name="VcsManagerConfiguration"> - <option name="OFFER_MOVE_TO_ANOTHER_CHANGELIST_ON_PARTIAL_COMMIT" value="true" /> - <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> - <option name="PERFORM_UPDATE_IN_BACKGROUND" value="false" /> - <option name="PERFORM_COMMIT_IN_BACKGROUND" value="false" /> - <option name="PUT_FOCUS_INTO_COMMENT" value="false" /> - <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" value="- fix minor bug in AbstractConsumerPersistenceManagerService that was making consumer invoker test failing
- set emptySessionPath=true for the tomcat test in order to make the session test pass" /> - <option name="SAVE_LAST_COMMIT_MESSAGE" value="true" /> - <option name="CHECKIN_DIALOG_SPLITTER_PROPORTION" value="0.8" /> - <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> - <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" /> - <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" /> - <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> - <option name="FILE_HISTORY_DIALOG_SPLITTER_PROPORTION" value="0.5" /> - <option name="ERROR_OCCURED" value="false" /> - <option name="ACTIVE_VCS_NAME" value="" /> - <option name="UPDATE_GROUP_BY_PACKAGES" value="false" /> - <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> - <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> - <MESSAGE value="- wire more portlet container beans
- inject kernel beans into the servlet context attributes
- added tomcat logging based on jul" /> - <MESSAGE value="fixed wrong registration logic" /> - <MESSAGE value="added a registration flag to know when we should unregister from the registry" /> - <MESSAGE value="leverage MC install/uninstall to update the PortletApplicationRegistry upon life cycle changes" /> - <MESSAGE value="added few comments" /> - <MESSAGE value="- forgot to wire the PortletContainer to the PortletApplication" /> - <MESSAGE value="- somehow the portal servlet can almost render portlets" /> - <MESSAGE value="improve singleton access to RemoteTestDriverServer" /> - <MESSAGE value="remove empty dirs" /> - <MESSAGE value="- fix minor bug in AbstractConsumerPersistenceManagerService that was making consumer invoker test failing
- set emptySessionPath=true for the tomcat test in order to make the session test pass" /> - </component> - <component name="VssConfiguration"> - <option name="CLIENT_PATH" value="" /> - <option name="SRCSAFEINI_PATH" value="" /> - <option name="USER_NAME" value="" /> - <option name="PWD" value="" /> - <option name="VSS_IS_INITIALIZED" value="true" /> - <CheckoutOptions> - <option name="COMMENT" value="" /> - <option name="DO_NOT_GET_LATEST_VERSION" value="false" /> - <option name="REPLACE_WRITABLE" value="false" /> - <option name="RECURSIVE" value="false" /> - </CheckoutOptions> - <CheckinOptions> - <option name="COMMENT" value="" /> - <option name="KEEP_CHECKED_OUT" value="false" /> - <option name="RECURSIVE" value="false" /> - </CheckinOptions> - <AddOptions> - <option name="STORE_ONLY_LATEST_VERSION" value="false" /> - <option name="CHECK_OUT_IMMEDIATELY" value="false" /> - <option name="FILE_TYPE" value="0" /> - </AddOptions> - <UndocheckoutOptions> - <option name="MAKE_WRITABLE" value="false" /> - <option name="REPLACE_LOCAL_COPY" value="0" /> - <option name="RECURSIVE" value="false" /> - </UndocheckoutOptions> - <GetOptions> - <option name="REPLACE_WRITABLE" value="0" /> - <option name="MAKE_WRITABLE" value="false" /> - <option name="ANSWER_NEGATIVELY" value="false" /> - <option name="ANSWER_POSITIVELY" value="false" /> - <option name="RECURSIVE" value="false" /> - <option name="VERSION" /> - </GetOptions> - <VssConfigurableExcludedFilesTag /> - </component> - <component name="antWorkspaceConfiguration"> - <option name="IS_AUTOSCROLL_TO_SOURCE" value="false" /> - <option name="FILTER_TARGETS" value="false" /> - </component> - <component name="com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable" proportions="" version="1"> - <option name="myLastEditedConfigurable" /> - </component> - <component name="com.intellij.openapi.roots.ui.configuration.projectRoot.ProjectRootMasterDetailsConfigurable" proportions="0.11111111" version="1"> - <option name="myPlainMode" value="false" /> - <option name="myLastEditedConfigurable" value="bridge" /> - </component> - <component name="com.intellij.profile.ui.ErrorOptionsConfigurable" proportions="" version="1"> - <option name="myLastEditedConfigurable" /> - </component> - <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="597" column="0" selection-start="21936" selection-end="21936" vertical-scroll-proportion="0.19346733"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="290" column="0" selection-start="9294" selection-end="9294" vertical-scroll-proportion="0.19346733"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="170" column="0" selection-start="7060" selection-end="7060" vertical-scroll-proportion="0.19605425"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="304" column="0" selection-start="11147" selection-end="11147" vertical-scroll-proportion="0.19346733"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="183" column="0" selection-start="6417" selection-end="6417" vertical-scroll-proportion="0.19346733"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="0" selection-start="2855" selection-end="2855" vertical-scroll-proportion="0.621455"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="319" column="25" selection-start="15935" selection-end="15935" vertical-scroll-proportion="0.06781751"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="24" selection-start="3634" selection-end="3634" vertical-scroll-proportion="0.2763819"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="41" column="0" selection-start="2243" selection-end="2243" vertical-scroll-proportion="0.25154132"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="33" column="13" selection-start="2151" selection-end="2151" vertical-scroll-proportion="0.13316892"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="67" column="30" selection-start="3207" selection-end="3207" vertical-scroll-proportion="0.5622688"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/test/src/resources/test/servers.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="42" column="36" selection-start="1345" selection-end="1345" vertical-scroll-proportion="0.621455"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="155" column="0" selection-start="6302" selection-end="6302" vertical-scroll-proportion="0.94081384"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> - <provider selected="true" editor-type-id="text-editor"> - <state line="840" column="0" selection-start="31597" selection-end="31597" vertical-scroll-proportion="0.015075377"> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/test/build.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state line="402" column="63" selection-start="19358" selection-end="19358" vertical-scroll-proportion="0.3329223"> - <folding /> - </state> - </provider> - </entry> - </component> - <component name="testng.defaultConfiguration"> - <outputDirectory /> - <properties /> - <groups /> - </component> -</project> -

18 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r8303 - in modules/portlet/trunk: test and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-17 19:46:53 -0400 (Mon, 17 Sep 2007) New Revision: 8303 Modified: modules/portlet/trunk/jboss-portal-portlet.iws modules/portlet/trunk/test/build.xml Log: typo Modified: modules/portlet/trunk/jboss-portal-portlet.iws =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-17 23:01:49 UTC (rev 8302) +++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-17 23:46:53 UTC (rev 8303) @@ -17,10 +17,7 @@ </component> <component name="ChangeListManager"> <list default="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/build.xml" afterPath="$PROJECT_DIR$/testsuite/build.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/build.xml" afterPath="$PROJECT_DIR$/test/build.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/test/servers.xml" afterPath="$PROJECT_DIR$/test/src/resources/test/servers.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" afterPath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" /> </list> </component> <component name="ChangeListSynchronizer" /> @@ -823,10 +820,10 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> + <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/test/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="346" column="0" selection-start="16903" selection-end="16903" vertical-scroll-proportion="0.5622688"> + <state line="402" column="63" selection-start="19358" selection-end="19358" vertical-scroll-proportion="0.3329223"> <folding /> </state> </provider> @@ -835,16 +832,16 @@ <file leaf-file-name="buildmagic.ent" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> <provider selected="true" editor-type-id="text-editor"> - <state line="840" column="0" selection-start="31597" selection-end="31597" vertical-scroll-proportion="0.63316584"> + <state line="840" column="0" selection-start="31597" selection-end="31597" vertical-scroll-proportion="0.015075377"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> + <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="127" column="109" selection-start="5489" selection-end="5489" vertical-scroll-proportion="0.4969174"> + <state line="155" column="0" selection-start="6302" selection-end="6302" vertical-scroll-proportion="0.94081384"> <folding /> </state> </provider> @@ -1040,7 +1037,7 @@ <showLibraryContents /> <hideEmptyPackages /> <abbreviatePackageNames /> - <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" /> + <showStructure ProjectPane="false" PackagesPane="false" Scope="false" Favorites="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -1250,7 +1247,7 @@ <editor active="true" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> - <window_info id="Maven-2 Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> + <window_info id="Maven-2 Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.329859" order="0" /> @@ -1452,23 +1449,23 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/build.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="346" column="0" selection-start="16903" selection-end="16903" vertical-scroll-proportion="0.5622688"> + <state line="155" column="0" selection-start="6302" selection-end="6302" vertical-scroll-proportion="0.94081384"> <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> <provider selected="true" editor-type-id="text-editor"> - <state line="840" column="0" selection-start="31597" selection-end="31597" vertical-scroll-proportion="0.63316584"> + <state line="840" column="0" selection-start="31597" selection-end="31597" vertical-scroll-proportion="0.015075377"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> + <entry file="file://$PROJECT_DIR$/test/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="127" column="109" selection-start="5489" selection-end="5489" vertical-scroll-proportion="0.4969174"> + <state line="402" column="63" selection-start="19358" selection-end="19358" vertical-scroll-proportion="0.3329223"> <folding /> </state> </provider> Modified: modules/portlet/trunk/test/build.xml =================================================================== --- modules/portlet/trunk/test/build.xml 2007-09-17 23:01:49 UTC (rev 8302) +++ modules/portlet/trunk/test/build.xml 2007-09-17 23:46:53 UTC (rev 8303) @@ -400,7 +400,7 @@ </target> <target name="tests.tomcat-6" depends="init"> - <fail message="Please set the environment variable JBOSS_6_0_HOME"> + <fail message="Please set the environment variable TOMCAT_6_0_HOME"> <condition> <and> <not>

18 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r8302 - in modules/common/trunk: common/src/main/java/org/jboss/portal/common/util and 4 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-17 19:01:49 -0400 (Mon, 17 Sep 2007) New Revision: 8302 Removed: modules/common/trunk/common/src/resources/format/ modules/common/trunk/common/src/resources/test/ Modified: modules/common/trunk/common/build.xml modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ComplexResourceBundleFactoryTestCase.java modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ImplodeTestCase.java modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/net/URLNavigatorTestCase.java modules/common/trunk/tools/etc/buildfragments/buildmagic.ent modules/common/trunk/tools/etc/buildfragments/defaults.ent Log: make common test suite work as before / fixed build for new directory structure Modified: modules/common/trunk/common/build.xml =================================================================== --- modules/common/trunk/common/build.xml 2007-09-17 21:07:11 UTC (rev 8301) +++ modules/common/trunk/common/build.xml 2007-09-17 23:01:49 UTC (rev 8302) @@ -115,8 +115,10 @@ _default:compile-classes, _default:compile-test-classes, _default:compile-etc, - _default:compile-resources"> + _default:compile-resources, + _default:compile-test-resources">  + </target> <target name="generate-parsers" depends="init"> @@ -134,15 +136,21 @@ description="Generate all target output." depends="compile"> - <mkdir dir="${build.lib}"/> + <mkdir dir="${build.lib}"/> - <jar jarfile="${build.lib}/portal-common-lib.jar" manifest="${build.etc}/portal-common-lib-jar.mf"> - <fileset dir="${build.resources}/format/code"/> - <fileset dir="${build.classes}"> - <exclude name="org/jboss/portal/common/ant/**/*"/> - </fileset> - </jar> + <jar jarfile="${build.lib}/portal-common-lib.jar" manifest="${build.etc}/portal-common-lib-jar.mf"> + <fileset dir="${build.resources}/format/code"/> + <fileset dir="${build.classes}"> + <exclude name="org/jboss/portal/common/ant/**/*"/> + </fileset> + </jar> + <jar jarfile="${build.lib}/portal-common-test-lib.jar"> + <fileset dir="${build.test.classes}"> + <exclude name="org/jboss/portal/common/ant/**/*"/> + </fileset> + </jar> +  <jar jarfile="${build.lib}/explode.jar"> <fileset dir="${build.classes}"> @@ -150,15 +158,14 @@ <include name="org/jboss/portal/common/junit/ant/**"/> </fileset> </jar> - </target> + </target> -  - <target name="package-tests" depends="init"> - <jar jarfile="${build.lib}/test.jar"> - <fileset dir="${build.resources}/test/test-jar"/> - </jar> - </target> +  + <target name="package-tests" depends="init"> + <jar jarfile="${build.test.resources}/test.jar"> + <fileset dir="${build.test.resources}/test-jar"/> + </jar> + </target>  @@ -242,7 +249,8 @@ </x-test> <x-classpath> <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}"/> + <pathelement location="${build.test.classes}"/> + <pathelement location="${build.test.resources}"/> <path refid="dom4j.dom4j.classpath"/> <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> Modified: modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java =================================================================== --- modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java 2007-09-17 21:07:11 UTC (rev 8301) +++ modules/common/trunk/common/src/main/java/org/jboss/portal/common/util/ParameterValidation.java 2007-09-17 23:01:49 UTC (rev 8302) @@ -47,16 +47,20 @@ { if (objectToTest == null) { - throw new IllegalArgumentException("Must pass a valid " + name); + throw new IllegalArgumentException("Must pass a non null " + name); } } /** @since 2.4.1 */ public static void throwIllegalArgExceptionIfNullOrEmpty(Object[] array, String name) { - if (array == null || array.length == 0) + if (array == null) { - throw new IllegalArgumentException("Must pass a non-null, non-empty " + name); + throw new IllegalArgumentException("Must pass a non-null " + name); } + if (array.length == 0) + { + throw new IllegalArgumentException("Must pass a non-empty " + name); + } } } Modified: modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ComplexResourceBundleFactoryTestCase.java =================================================================== --- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ComplexResourceBundleFactoryTestCase.java 2007-09-17 21:07:11 UTC (rev 8301) +++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ComplexResourceBundleFactoryTestCase.java 2007-09-17 23:01:49 UTC (rev 8302) @@ -40,23 +40,16 @@ { /** . */ - private File resourcesDir; - - /** . */ private ClassLoader cl; protected void setUp() throws Exception { - File f = new File(""); - String path = f.getAbsolutePath(); - resourcesDir = new File(path + "/target/test-classes"); - assertTrue(resourcesDir.exists()); - assertTrue(resourcesDir.isDirectory()); - - File bundle = new File(resourcesDir, "/bundle"); - assertTrue(bundle.exists()); - assertTrue(bundle.isDirectory()); - cl = new URLClassLoader(new URL[]{bundle.toURL()}, ClassLoader.getSystemClassLoader()); + URL bundleURL = Thread.currentThread().getContextClassLoader().getResource("bundle"); + assertNotNull(bundleURL); + File f = new File(bundleURL.getFile()); + assertTrue(f.exists()); + assertTrue(f.isDirectory()); + cl = new URLClassLoader(new URL[]{f.toURL()}, ClassLoader.getSystemClassLoader()); } public void testExactMatch() throws Exception Modified: modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ImplodeTestCase.java =================================================================== --- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ImplodeTestCase.java 2007-09-17 21:07:11 UTC (rev 8301) +++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/ImplodeTestCase.java 2007-09-17 23:01:49 UTC (rev 8302) @@ -26,6 +26,7 @@ import org.jboss.portal.common.ant.Implode; import java.io.File; +import java.net.URL; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -41,13 +42,12 @@ public void testA() throws Exception { - File f = new File(""); - String path = f.getAbsolutePath(); - - File foo_sarDir = new File(path + "/target/test-classes/implode/foo.sar"); - + URL foo_sarURL = Thread.currentThread().getContextClassLoader().getResource("implode/foo.sar"); + assertNotNull(foo_sarURL); + File foo_sarDir = new File(foo_sarURL.getFile()); assertTrue(foo_sarDir.exists()); assertTrue(foo_sarDir.isDirectory()); + File tmp = File.createTempFile("foo", ".sar"); tmp.deleteOnExit(); tmp.setLastModified(foo_sarDir.lastModified() - 1); Modified: modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/net/URLNavigatorTestCase.java =================================================================== --- modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/net/URLNavigatorTestCase.java 2007-09-17 21:07:11 UTC (rev 8301) +++ modules/common/trunk/common/src/test/java/org/jboss/portal/test/common/net/URLNavigatorTestCase.java 2007-09-17 23:01:49 UTC (rev 8302) @@ -35,6 +35,7 @@ import org.jboss.portal.common.net.URLFilter; import org.jboss.portal.common.net.URLNavigator; import org.jboss.portal.common.net.URLVisitor; +import org.jboss.portal.common.net.URLTools; /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> @@ -171,7 +172,7 @@ public void testRootWithFile() throws Exception { - URL fileURL = getFileURL ("/test-jar"); + URL fileURL = getFileURL ("test-jar"); ArrayList expectedAtoms = new ArrayList(); expectedAtoms.add("<test-jar>"); @@ -228,7 +229,7 @@ public void testDirectoryWithFile() throws Exception { - URL fileURL = getFileURL ("test-jar/a1/"); + URL fileURL = getFileURL("test-jar/a1/"); doDirectoryTest(fileURL); } @@ -417,7 +418,7 @@ public void testFileURLs() throws Exception { //Note no / at the end - URL fileURL = getFileURL("/test-jar/a1"); + URL fileURL = getFileURL("test-jar/a1"); doTest (fileURL, expectedAtomsA1, expectedURLsA1, noFilter); doTest (fileURL, new ArrayList(), new ArrayList(), fullFilter); @@ -440,36 +441,24 @@ /*----------Utility Metods and Classes ---------------*/ - private URL getFileURL (String name) throws MalformedURLException + private URL getFileURL(String name) throws MalformedURLException { - File f = new File(""); - String resourcePath = f.getAbsolutePath() + "/target/test-classes"; - File resourcesDir = new File(resourcePath); - assertTrue(resourcesDir.exists()); - assertTrue(resourcesDir.isDirectory()); - - File file = new File (resourcesDir, name); - assertTrue (file.exists()); - return file.toURL(); + URL url = Thread.currentThread().getContextClassLoader().getResource(name); + assertNotNull("Could not load URL for file " + name, url); + assertTrue(URLTools.exists(url)); + return url; } - private URL getJarURL (String name) throws MalformedURLException + private URL getJarURL(String name) throws MalformedURLException { - File f = new File(""); - String libPath = f.getAbsolutePath() + "/target"; - assertNotNull(libPath); - File libDir = new File(libPath); - assertTrue(libDir.exists()); - assertTrue(libDir.isDirectory()); - File jarFile = new File(libDir, TEST_JAR_NAME); + URL url = getFileURL(TEST_JAR_NAME); + File jarFile = new File(url.getFile()); assertTrue(jarFile.exists()); - jarFile.deleteOnExit(); - assertFalse(jarFile.isDirectory()); - URL jarURL = new URL("jar", "", jarFile.toURL() + "!" + name); - return jarURL; + return new URL("jar", "", jarFile.toURL() + "!" + name); } - public List removeFiles(ArrayList list){ + public List removeFiles(ArrayList list) + { ArrayList newList = (ArrayList)list.clone(); ArrayList fileList = new ArrayList(); Modified: modules/common/trunk/tools/etc/buildfragments/buildmagic.ent =================================================================== --- modules/common/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-17 21:07:11 UTC (rev 8301) +++ modules/common/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-17 23:01:49 UTC (rev 8302) @@ -405,30 +405,32 @@ <target name="_default:compile-test-classes" depends="_buildmagic:init" unless="compile.disable"> <mkdir dir="${build.test}"/> + <mkdir dir="${build.test.classes}"/>  <mkdir dir="${build.gen.test}"/>  - <depend srcdir="${source.test}:${build.gen.test}" - destdir="${build.test}" + <depend srcdir="${source.test.classes}" + destdir="${build.test.classes}" dump="${javac.depend.dump}" closure="${javac.depend.closure}"> <include name="${javac.includes}"/> <exclude name="${javac.excludes}"/> </depend> - <javac destdir="${build.test}" + <javac destdir="${build.test.classes}" optimize="${javac.optimize}" target="${javac.target}" debug="${javac.debug}" + source="${javac.source}" depend="${javac.depend}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" includeAntRuntime="${javac.include.ant.runtime}" includeJavaRuntime="${javac.include.java.runtime}" failonerror="${javac.fail.onerror}"> - <src path="${source.test}:${build.gen.test}"/> + <src path="${source.test.classes}"/> <classpath> <path refid="javac.classpath"/> <pathelement location="${build.classes}"/> @@ -475,6 +477,27 @@ </copy> </target> +<target name="_default:check-exists-test-resources"> + <condition property="source.test.resources.exists"> + <available file="${source.test.resources}" type="dir"/> + </condition> +</target> + + +<target name="_default:compile-test-resources" depends="_buildmagic:init, _default:check-exists-test-resources" unless="compile.disable" if="source.test.resources.exists"> + <mkdir dir="${build.test.resources}"/> + <copy todir="${build.test.resources}" filtering="yes"> + <fileset dir="${source.test.resources}"> + <patternset refid="compile-resources.filter.pattern"/> + </fileset> + </copy> + <copy todir="${build.test.resources}" filtering="no"> + <fileset dir="${source.test.resources}"> + <patternset refid="compile-resources.pattern"/> + </fileset> + </copy> +</target> + <patternset id="compile-resources.filter.pattern"> <include name="**/*"/> </patternset> @@ -595,7 +618,7 @@ <mkdir dir="${build.test}"/>  - <mkdir dir="${build.gen.test}"/> + <mkdir dir="${build.test.gen}"/> <path id="tests.classpath"> <pathelement path="${classpath}"/> Modified: modules/common/trunk/tools/etc/buildfragments/defaults.ent =================================================================== --- modules/common/trunk/tools/etc/buildfragments/defaults.ent 2007-09-17 21:07:11 UTC (rev 8301) +++ modules/common/trunk/tools/etc/buildfragments/defaults.ent 2007-09-17 23:01:49 UTC (rev 8302) @@ -37,15 +37,17 @@   - <property name="source.classes" value="${module.source}/main"/> + <property name="source.classes" value="${module.source}/main/java"/> <property name="source.docs" value="${module.source}/docs"/> <property name="source.etc" value="${module.source}/etc"/> <property name="source.examples" value="${module.source}/examples"/> <property name="source.bin" value="${module.source}/bin"/> - <property name="source.resources" value="${module.source}/resources"/> + <property name="source.resources" value="${module.source}/main/resources"/> <property name="source.stylesheets" value="${module.source}/stylesheets"/> <property name="source.web" value="${module.source}/web"/> <property name="source.test" value="${module.source}/test"/> + <property name="source.test.classes" value="${module.source}/test/java"/> + <property name="source.test.resources" value="${module.source}/test/resources"/>  <property name="build.api" value="${module.output}/api"/> @@ -68,7 +70,9 @@ <property name="build.log" value="${module.output}/log"/> <property name="build.cache" value="${module.output}/cache"/> <property name="build.test" value="${module.output}/test"/> - <property name="build.gen.test" value="${build.gen}/test"/> + <property name="build.test.classes" value="${module.output}/test/classes"/> + <property name="build.test.resources" value="${module.output}/test/resources"/> + <property name="build.test.gen" value="${build.gen}/test/gen"/>  <property name="build.metadata" value="${module.output}/metadata"/>

18 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r8301 - in modules/portlet/trunk: test and 3 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-17 17:07:11 -0400 (Mon, 17 Sep 2007) New Revision: 8301 Modified: modules/portlet/trunk/jboss-portal-portlet.ipr modules/portlet/trunk/jboss-portal-portlet.iws modules/portlet/trunk/test/build.xml modules/portlet/trunk/test/src/resources/test/servers.xml modules/portlet/trunk/testsuite/build.xml modules/portlet/trunk/tools/etc/buildfragments/buildmagic.ent Log: support 4.2.0 and 4.2.1 for portlet container tests Modified: modules/portlet/trunk/jboss-portal-portlet.ipr =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.ipr 2007-09-17 20:59:55 UTC (rev 8300) +++ modules/portlet/trunk/jboss-portal-portlet.ipr 2007-09-17 21:07:11 UTC (rev 8301) @@ -129,6 +129,32 @@ <option name="FILTER_INFO" value="true" /> <option name="CUSTOM_FILTER" /> </component> + <component name="MavenBuildProjectComponent"> + <option name="mavenExecutable" value="" /> + <option name="Settings File" value="" /> + <option name="mavenCommandLineParams" value="" /> + <option name="vmOptions" value="" /> + <option name="useMavenEmbedder" value="false" /> + <option name="useFilter" value="false" /> + <option name="Batch Mode" value="false" /> + <option name="Check Plugin Updates" value="false" /> + <option name="Debug" value="false" /> + <option name="Errors" value="false" /> + <option name="Fail At End" value="false" /> + <option name="Fail Fast" value="false" /> + <option name="Fail Never" value="false" /> + <option name="Lax Checksums" value="false" /> + <option name="No Plugin Registry" value="false" /> + <option name="No Plugin Updates" value="false" /> + <option name="Non Recursive" value="false" /> + <option name="Offline" value="false" /> + <option name="Reactor" value="false" /> + <option name="Strict Checksums" value="false" /> + <option name="Update Plugins" value="false" /> + <option name="Update Snapshots" value="false" /> + <option name="Skip Tests" value="false" /> + <pom-list /> + </component> <component name="Palette2"> <group name="Swing"> <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false"> Modified: modules/portlet/trunk/jboss-portal-portlet.iws =================================================================== --- modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-17 20:59:55 UTC (rev 8300) +++ modules/portlet/trunk/jboss-portal-portlet.iws 2007-09-17 21:07:11 UTC (rev 8301) @@ -16,7 +16,12 @@ <option name="USER" value="" /> </component> <component name="ChangeListManager"> - <list default="true" name="Default" comment="" /> + <list default="true" name="Default" comment=""> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/testsuite/build.xml" afterPath="$PROJECT_DIR$/testsuite/build.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/build.xml" afterPath="$PROJECT_DIR$/test/build.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/test/src/resources/test/servers.xml" afterPath="$PROJECT_DIR$/test/src/resources/test/servers.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" afterPath="$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent" /> + </list> </component> <component name="ChangeListSynchronizer" /> <component name="ChangesViewManager" flattened_view="true" /> @@ -818,96 +823,33 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="AbstractStatefulPortletInvokerTestCase.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java"> + <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/test/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="290" column="0" selection-start="9294" selection-end="9294" vertical-scroll-proportion="0.19346733"> + <state line="346" column="0" selection-start="16903" selection-end="16903" vertical-scroll-proportion="0.5622688"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="StringValue.class" pinned="false" current="false" current-in-tab="false"> - <entry file="jar://$PROJECT_DIR$/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/org/jboss/portal/common/value/StringValue.class"> + <file leaf-file-name="buildmagic.ent" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.14796548"> + <state line="840" column="0" selection-start="31597" selection-end="31597" vertical-scroll-proportion="0.63316584"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ConsumerStatefulPortletInvokerTestCase.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="170" column="0" selection-start="7060" selection-end="7060" vertical-scroll-proportion="0.19605425"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ConsumerPortletInvoker.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="304" column="0" selection-start="11147" selection-end="11147" vertical-scroll-proportion="0.19346733"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ProducerPortletInvoker.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="597" column="0" selection-start="21936" selection-end="21936" vertical-scroll-proportion="0.19346733"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="PortletInvokerSupport.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="183" column="0" selection-start="6417" selection-end="6417" vertical-scroll-proportion="0.19346733"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="PreferencesInfoSupport.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="0" selection-start="2855" selection-end="2855" vertical-scroll-proportion="0.621455"> - <folding /> - </state> - </provider> - </entry> - </file> <file leaf-file-name="build.xml" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="353" column="16" selection-start="18024" selection-end="18024" vertical-scroll-proportion="0.57090014"> + <state line="127" column="109" selection-start="5489" selection-end="5489" vertical-scroll-proportion="0.4969174"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="AbstractConsumerPersistenceManagerService.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="24" selection-start="3634" selection-end="3634" vertical-scroll-proportion="0.2763819"> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ConsumerPersistenceManagerService.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java"> - <provider selected="true" editor-type-id="text-editor"> - <state line="41" column="0" selection-start="2243" selection-end="2243" vertical-scroll-proportion="0.25154132"> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindManager"> @@ -996,14 +938,8 @@ <option name="myItemId" value="jboss-portal-portlet.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="jboss-portal-portlet.ipr" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> + <option name="myItemId" value="tools" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> </PATH> @@ -1013,11 +949,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> + <option name="myItemId" value="tools" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1027,15 +963,15 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> + <option name="myItemId" value="tools" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1045,71 +981,27 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> + <option name="myItemId" value="tools" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/tools/etc/buildfragments" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="jboss-portal-portlet.ipr" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1117,29 +1009,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1147,30 +1019,18 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="portlet" /> + <option name="myItemId" value="testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet" /> + <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/testsuite" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/portlet/src/main/org/jboss/portal" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> </subPane> </component> <component name="ProjectReloadState"> - <option name="STATE" value="2" /> + <option name="STATE" value="0" /> </component> <component name="ProjectView"> <navigator currentView="ProjectPane" proportions="0.11111111" version="1" splitterProportion="0.5"> @@ -1180,7 +1040,7 @@ <showLibraryContents /> <hideEmptyPackages /> <abbreviatePackageNames /> - <showStructure PackagesPane="false" ProjectPane="false" Scope="false" Favorites="false" /> + <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" /> <autoscrollToSource /> <autoscrollFromSource /> <sortByType /> @@ -1215,12 +1075,24 @@ </component> <component name="RestoreUpdateTree" /> <component name="RunManager" selected="Remote.Runner"> - <configuration default="true" type="Remote" factoryName="Remote"> - <option name="USE_SOCKET_TRANSPORT" value="true" /> - <option name="SERVER_MODE" value="false" /> - <option name="SHMEM_ADDRESS" value="javadebug" /> - <option name="HOST" value="localhost" /> - <option name="PORT" value="5005" /> + <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> + <module name="" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" /> + <option name="PACKAGE_NAME" /> + <option name="MAIN_CLASS_NAME" /> + <option name="METHOD_NAME" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" /> + <option name="PARAMETERS" /> + <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> + <option name="ADDITIONAL_CLASS_PATH" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="wholeProject" /> + </option> + <method> + <option name="Make" value="true" /> + </method> </configuration> <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> @@ -1244,24 +1116,12 @@ <option name="ENABLE_SWING_INSPECTOR" value="false" /> <module name="" /> </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false"> - <module name="" /> - <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> - <option name="ALTERNATIVE_JRE_PATH" /> - <option name="PACKAGE_NAME" /> - <option name="MAIN_CLASS_NAME" /> - <option name="METHOD_NAME" /> - <option name="TEST_OBJECT" value="class" /> - <option name="VM_PARAMETERS" /> - <option name="PARAMETERS" /> - <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> - <option name="ADDITIONAL_CLASS_PATH" /> - <option name="TEST_SEARCH_SCOPE"> - <value defaultName="wholeProject" /> - </option> - <method> - <option name="Make" value="true" /> - </method> + <configuration default="true" type="Remote" factoryName="Remote"> + <option name="USE_SOCKET_TRANSPORT" value="true" /> + <option name="SERVER_MODE" value="false" /> + <option name="SHMEM_ADDRESS" value="javadebug" /> + <option name="HOST" value="localhost" /> + <option name="PORT" value="5005" /> </configuration> <configuration default="false" name="Tomcat" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> @@ -1386,12 +1246,12 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="11" y="29" width="1680" height="958" extended-state="0" /> + <frame x="24" y="24" width="1680" height="958" extended-state="0" /> <editor active="true" /> <layout> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> + <window_info id="Maven-2 Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="-1" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.329859" order="0" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.329849" order="1" /> @@ -1409,12 +1269,13 @@ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3786295" order="4" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" /> <window_info id="JProfiler" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> - <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> + <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" /> <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" /> + <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" /> </layout> </component> <component name="VCS.FileViewConfiguration"> @@ -1507,111 +1368,116 @@ <option name="myLastEditedConfigurable" /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="1122" column="0" selection-start="39981" selection-end="39981" vertical-scroll-proportion="0.879397"> + <state line="597" column="0" selection-start="21936" selection-end="21936" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/jsr168/tck/portletsession/PortletSessionSequenceBuilder.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="243" column="12" selection-start="12668" selection-end="12668" vertical-scroll-proportion="0.33291456"> + <state line="290" column="0" selection-start="9294" selection-end="9294" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/test/build.xml"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="329" column="67" selection-start="16466" selection-end="16466" vertical-scroll-proportion="-4.4685574"> + <state line="170" column="0" selection-start="7060" selection-end="7060" vertical-scroll-proportion="0.19605425"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/ContentTypesTestCase.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="38" column="13" selection-start="2241" selection-end="2241" vertical-scroll-proportion="0.16276202"> + <state line="304" column="0" selection-start="11147" selection-end="11147" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/info/PortletInfoSupport.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="36" column="13" selection-start="2277" selection-end="2277" vertical-scroll-proportion="0.22594142"> + <state line="183" column="0" selection-start="6417" selection-end="6417" vertical-scroll-proportion="0.19346733"> <folding /> </state> </provider> </entry> - <entry file="jar://$PROJECT_DIR$/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar!/org/jboss/portal/common/value/StringValue.class"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="11" column="0" selection-start="389" selection-end="389" vertical-scroll-proportion="0.14796548"> + <state line="69" column="0" selection-start="2855" selection-end="2855" vertical-scroll-proportion="0.621455"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/support/info/PreferencesInfoSupport.java"> + <entry file="file://$PROJECT_DIR$/portlet/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="69" column="0" selection-start="2855" selection-end="2855" vertical-scroll-proportion="0.621455"> + <state line="319" column="25" selection-start="15935" selection-end="15935" vertical-scroll-proportion="0.06781751"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/PortletInvokerSupport.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="183" column="0" selection-start="6417" selection-end="6417" vertical-scroll-proportion="0.19346733"> + <state line="74" column="24" selection-start="3634" selection-end="3634" vertical-scroll-proportion="0.2763819"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/producer/ProducerPortletInvoker.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="597" column="0" selection-start="21936" selection-end="21936" vertical-scroll-proportion="0.19346733"> + <state line="41" column="0" selection-start="2243" selection-end="2243" vertical-scroll-proportion="0.25154132"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/CacheInfoTest.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="290" column="0" selection-start="9294" selection-end="9294" vertical-scroll-proportion="0.19346733"> + <state line="33" column="13" selection-start="2151" selection-end="2151" vertical-scroll-proportion="0.13316892"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/state/ConsumerStatefulPortletInvokerTestCase.java"> + <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/test/portlet/info/ModeInfoTest.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="170" column="0" selection-start="7060" selection-end="7060" vertical-scroll-proportion="0.19605425"> + <state line="67" column="30" selection-start="3207" selection-end="3207" vertical-scroll-proportion="0.5622688"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/state/consumer/ConsumerPortletInvoker.java"> + <entry file="file://$PROJECT_DIR$/test/src/resources/test/servers.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="304" column="0" selection-start="11147" selection-end="11147" vertical-scroll-proportion="0.19346733"> + <state line="42" column="36" selection-start="1345" selection-end="1345" vertical-scroll-proportion="0.621455"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/ConsumerPersistenceManagerService.java"> + <entry file="file://$PROJECT_DIR$/test/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="41" column="0" selection-start="2243" selection-end="2243" vertical-scroll-proportion="0.25154132"> + <state line="346" column="0" selection-start="16903" selection-end="16903" vertical-scroll-proportion="0.5622688"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/src/main/org/jboss/portal/portlet/impl/state/consumer/AbstractConsumerPersistenceManagerService.java"> + <entry file="file://$PROJECT_DIR$/tools/etc/buildfragments/buildmagic.ent"> <provider selected="true" editor-type-id="text-editor"> - <state line="74" column="24" selection-start="3634" selection-end="3634" vertical-scroll-proportion="0.2763819"> + <state line="840" column="0" selection-start="31597" selection-end="31597" vertical-scroll-proportion="0.63316584"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/portlet/build.xml"> + <entry file="file://$PROJECT_DIR$/testsuite/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="353" column="16" selection-start="18024" selection-end="18024" vertical-scroll-proportion="0.57090014"> + <state line="127" column="109" selection-start="5489" selection-end="5489" vertical-scroll-proportion="0.4969174"> <folding /> </state> </provider> </entry> </component> + <component name="testng.defaultConfiguration"> + <outputDirectory /> + <properties /> + <groups /> + </component> </project> Modified: modules/portlet/trunk/test/build.xml =================================================================== --- modules/portlet/trunk/test/build.xml 2007-09-17 20:59:55 UTC (rev 8300) +++ modules/portlet/trunk/test/build.xml 2007-09-17 21:07:11 UTC (rev 8301) @@ -269,12 +269,12 @@ </taskdef> </target> - <target name="cargo.jboss.start" depends="cargo.setup"> + <target name="cargo.jboss-4.2.start" depends="cargo.setup"> <cargo containerId="jboss42x" - home="${jboss-4.2.home}" - output="${cargo.log.dir}/cargo.jboss.server.log" - log="${cargo.log.dir}/cargo.jboss.log" + home="${test.jboss-4.2.home}" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + log="${cargo.log.dir}/cargo.${test.id}.startup.log" action="start" wait="${cargo.wait}"> <sharedClasspath> @@ -292,11 +292,11 @@ </cargo> </target> - <target name="cargo.jboss.stop" depends="cargo.setup"> + <target name="cargo.jboss-4.2.stop" depends="cargo.setup"> <cargo containerId="jboss42x" - home="${jboss-4.2.home}" - log="${cargo.log.dir}/cargo.jboss.log" + home="${test.jboss-4.2.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" action="stop"> <configuration> <property name="cargo.rmi.port" value="1099"/> @@ -304,12 +304,55 @@ </cargo> </target> - <target name="cargo.tomcat.start" depends="cargo.setup"> + <target name="tests.jboss-4.2.container-servlet" depends="init" if="${test.jboss-4.2.home.variable-name}"> + <antcall target="cargo.jboss-4.2.start"> + <param name="cargo.wait" value="false"/> + </antcall> + <antcall target="tests.remote"> + <param name="server.name" value="${test.jboss-4.2.name}"/> + </antcall> + <antcall target="cargo.jboss-4.2.stop"> + </antcall> + </target> + + <target name="tests.jboss-4.2" depends="init"> + <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME"> + <condition> + <and> + <not> + <isset property="jboss-4.2.0.home"/> + </not> + <not> + <isset property="jboss-4.2.1.home"/> + </not> + </and> + </condition> + </fail> + <antcall target="tests.jboss-4.2.container-servlet"> + <param name="test.id" value="JBoss-4_2_0-container-servlet"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> + <param name="test.jboss-4.2.home" value="${jboss-4.2.0.home}"/> + <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.0.home"/> + </antcall> + <antcall target="tests.jboss-4.2.container-servlet"> + <param name="test.id" value="JBoss-4_2_1-container-servlet"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_1"/> + <param name="test.jboss-4.2.home" value="${jboss-4.2.1.home}"/> + <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.1.home"/> + </antcall> + </target> + + <target name="tests.jboss" depends="init"> + <antcall target="tests.jboss-4.2"> + </antcall> + </target> + + <target name="cargo.tomcat-6.start" depends="cargo.setup"> <cargo containerId="tomcat5x" - home="${tomcat-6.0.home}" - output="${cargo.log.dir}/cargo.tomcat.server.log" - log="${cargo.log.dir}/cargo.tomcat.log" + home="${test.tomcat-6.home}" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + log="${cargo.log.dir}/cargo.${test.id}.startup.log" action="start" wait="${cargo.wait}"> <sharedClasspath> @@ -333,41 +376,50 @@ </cargo> </target> - <target name="cargo.tomcat.stop" depends="cargo.setup"> + <target name="cargo.tomcat-6.stop" depends="cargo.setup"> <cargo containerId="tomcat5x" - home="${tomcat-6.0.home}" - log="${cargo.log.dir}/cargo.tomcat.log" + home="${test.tomcat-6.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" action="stop"> <configuration> </configuration> </cargo> </target> - <target name="tests.jboss" depends="init"> - <fail unless="jboss-4.2.home" message="Please set the environment variable JBOSS_4_2_HOME"/> - <echo message="Starting JBoss 4.2 tests with ${jboss-4.2.home}"/> - <antcall target="cargo.jboss.start"> + <target name="tests.tomcat-6.container-servlet" depends="init" if="${test.tomcat-6.home.variable-name}"> + <echo message="Starting Tomcat 6 container-servlet tests with ${test.tomcat-6.home}"/> + <antcall target="cargo.tomcat-6.start"> <param name="cargo.wait" value="false"/> </antcall> <antcall target="tests.remote"> - <param name="server.name" value="RemoteJBoss_4_2"/> + <param name="server.name" value="RemoteTomcat_6_0"/> </antcall> - <antcall target="cargo.jboss.stop"> + <antcall target="cargo.tomcat-6.stop"> </antcall> </target> + <target name="tests.tomcat-6" depends="init"> + <fail message="Please set the environment variable JBOSS_6_0_HOME"> + <condition> + <and> + <not> + <isset property="tomcat-6.0.home"/> + </not> + </and> + </condition> + </fail> + <antcall target="tests.tomcat-6.container-servlet"> + <param name="test.id" value="Tomcat-6_0-container-servlet"/> + <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> + <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> + <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> + </antcall> + </target> + <target name="tests.tomcat" depends="init"> - <fail unless="tomcat-6.0.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> - <echo message="Starting Tomcat 6.0 tests with ${tomcat-6.0.home}"/> - <antcall target="cargo.tomcat.start"> - <param name="cargo.wait" value="false"/> + <antcall target="tests.tomcat-6"> </antcall> - <antcall target="tests.remote"> - <param name="server.name" value="RemoteTomcat_6_0"/> - </antcall> - <antcall target="cargo.tomcat.stop"> - </antcall> </target> <target name="tests.remote" depends="init"> @@ -378,78 +430,78 @@  <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.DispatcherTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-dispatcher.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletConfigTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-portletconfig.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletContextTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-portletcontext.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletInterfaceTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-portletinterface.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletModeTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-portletmode.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletRequestsTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-portletrequests.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletResponsesTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-portletresponses.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletSessionTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-portletsession.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PortletURLTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-portleturl.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.PreferencesTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-preferences.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase" - id="org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase" + id="org.jboss.portal.test.portlet.jsr168.tck.WindowStatesTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-windowstates.war"/> <parameter name="serverName" value="${server.name}"/> </zest> @@ -457,92 +509,92 @@  <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.ActionRequestTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-actionrequest.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.ActionResponseTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-actionresponse.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortalContextTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-portalcontext.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletConfigTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-portletconfig.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletContextTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-portletcontext.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletModeTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-portletmode.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletPreferencesTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-portletpreferences.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-portletsession.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletSessionUtilTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-portletsessionutil.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.PortletURLTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-portleturl.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.RenderRequestTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-renderrequest.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.RenderResponseTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-renderresponse.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase" - id="org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase" + id="org.jboss.portal.test.portlet.jsr168.api.WindowStateTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-api-windowstate.war"/> <parameter name="serverName" value="${server.name}"/> </zest> @@ -550,71 +602,71 @@  <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.DispatcherTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-ext-dispatcher.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletConfigTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-ext-portletconfig.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletModeTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-ext-portletmode.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletRequestsTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-ext-portletrequests.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PortletResponsesTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-ext-portletresponses.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.PreferencesTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-ext-preferences.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.SessionTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-ext-session.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.ExpiringCacheTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-ext-expiringcache.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.NeverExpiringCacheTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-ext-neverexpiringcache.war"/> <parameter name="serverName" value="${server.name}"/> </zest> <zest todir="${test.reports}" name="org.jboss.portal.test.framework.runner.HTTPTestRunner" - outfile="TEST-${server.name}.org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase" - id="org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase,serverName=${server.name}"> + outfile="TEST-${test.id}.org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase" + id="org.jboss.portal.test.portlet.jsr168.ext.NoCacheTestCase,${test.id}"> <parameter name="archive" value="test-jsr168-ext-nocache.war"/> <parameter name="serverName" value="${server.name}"/> </zest> @@ -623,8 +675,8 @@  <property environment="env"/> -  - <condition property="jboss-4.2.home" value="${env.JBOSS_4_2_HOME}"> +  + + <condition property="jboss-4.2.0.home" value="${env.JBOSS_4_2_0_HOME}"> <and> <not> - <isset property="jboss-4.2.home"/> + <isset property="jboss-4.2.0.home"/> </not> - <isset property="env.JBOSS_4_2_HOME"/> + <isset property="env.JBOSS_4_2_0_HOME"/> </and> </condition> + <condition property="jboss-4.2.1.home" value="${env.JBOSS_4_2_1_HOME}"> + <and> + <not> + <isset property="jboss-4.2.1.home"/> + </not> + <isset property="env.JBOSS_4_2_1_HOME"/> + </and> + </condition> -  +  + <condition property="tomcat-6.0.home" value="${env.TOMCAT_6_0_HOME}"> <and> <not>

18 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r8300 - in modules/web/trunk: web and 1 other directory.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-17 16:59:55 -0400 (Mon, 17 Sep 2007) New Revision: 8300 Modified: modules/web/trunk/tools/etc/buildfragments/buildmagic.ent modules/web/trunk/web/build.xml Log: slightly improve the build file Modified: modules/web/trunk/tools/etc/buildfragments/buildmagic.ent =================================================================== --- modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-17 20:32:44 UTC (rev 8299) +++ modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-17 20:59:55 UTC (rev 8300) @@ -102,7 +102,8 @@ </and> </condition> -  +  + <condition property="tomcat-6.0.home" value="${env.TOMCAT_6_0_HOME}"> <and> <not> Modified: modules/web/trunk/web/build.xml =================================================================== --- modules/web/trunk/web/build.xml 2007-09-17 20:32:44 UTC (rev 8299) +++ modules/web/trunk/web/build.xml 2007-09-17 20:59:55 UTC (rev 8300) @@ -391,7 +391,6 @@ </target> <target name="tests.jboss-4.2" depends="init"> - <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME"> <condition> <and> @@ -404,35 +403,35 @@ </and> </condition> </fail> - <antcall target="tests.jboss-4.2.container-servlet"> <param name="test.id" value="JBoss-4_2_0-container-servlet"/> <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> <param name="test.jboss-4.2.home" value="${jboss-4.2.0.home}"/> <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.0.home"/> </antcall> - <antcall target="tests.jboss-4.2.container-servlet"> <param name="test.id" value="JBoss-4_2_1-container-servlet"/> <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_1"/> <param name="test.jboss-4.2.home" value="${jboss-4.2.1.home}"/> <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.1.home"/> </antcall> - <antcall target="tests.jboss-4.2.generic"> <param name="test.id" value="JBoss-4_2_0-generic"/> <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> <param name="test.jboss-4.2.home" value="${jboss-4.2.0.home}"/> <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.0.home"/> </antcall> - <antcall target="tests.jboss-4.2.generic"> <param name="test.id" value="JBoss-4_2_1-generic"/> <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_1"/> <param name="test.jboss-4.2.home" value="${jboss-4.2.1.home}"/> <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.1.home"/> </antcall> + </target> + <target name="tests.jboss" depends="init"> + <antcall target="tests.jboss-4.2"> + </antcall> </target> <target name="cargo.tomcat-6.start" depends="cargo.setup"> @@ -472,32 +471,6 @@ </cargo> </target> - <target name="tests.tomcat-6" depends="init"> - - <fail message="Please set the environment variable JBOSS_6_0_HOME"> - <condition> - <and> - <not> - <isset property="tomcat-6.0.home"/> - </not> - </and> - </condition> - </fail> - - <antcall target="tests.tomcat-6.container-servlet"> - <param name="test.id" value="Tomcat-6_0-container-servlet"/> - <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> - <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> - <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> - </antcall> - <antcall target="tests.tomcat-6.generic"> - <param name="test.id" value="Tomcat-6_0-generic"/> - <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> - <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> - <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> - </antcall> - </target> - <target name="tests.tomcat-6.container-servlet" depends="init" if="${test.tomcat-6.home.variable-name}"> <echo message="Starting Tomcat 6 container-servlet tests with ${test.tomcat-6.home}"/> <antcall target="cargo.tomcat-6.start"> @@ -527,6 +500,35 @@ </antcall> </target> + <target name="tests.tomcat-6" depends="init"> + <fail message="Please set the environment variable JBOSS_6_0_HOME"> + <condition> + <and> + <not> + <isset property="tomcat-6.0.home"/> + </not> + </and> + </condition> + </fail> + <antcall target="tests.tomcat-6.container-servlet"> + <param name="test.id" value="Tomcat-6_0-container-servlet"/> + <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> + <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> + <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> + </antcall> + <antcall target="tests.tomcat-6.generic"> + <param name="test.id" value="Tomcat-6_0-generic"/> + <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> + <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> + <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> + </antcall> + </target> + + <target name="tests.tomcat" depends="init"> + <antcall target="tests.tomcat-6.generic"> + </antcall> + </target> + <target name="tests" depends="init"> <antcall target="tests.local"/> <antcall target="tests.jboss-4.2"/>

18 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r8299 - in modules/web/trunk: tools/etc/buildfragments and 2 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-09-17 16:32:44 -0400 (Mon, 17 Sep 2007) New Revision: 8299 Modified: modules/web/trunk/testsuite/build.xml modules/web/trunk/tools/etc/buildfragments/buildmagic.ent modules/web/trunk/web/build.xml modules/web/trunk/web/src/resources/test/config/servers.xml Log: added support for test of jboss 4.2.0 and 4.2.1 Modified: modules/web/trunk/testsuite/build.xml =================================================================== --- modules/web/trunk/testsuite/build.xml 2007-09-17 15:52:54 UTC (rev 8298) +++ modules/web/trunk/testsuite/build.xml 2007-09-17 20:32:44 UTC (rev 8299) @@ -123,7 +123,7 @@  <delete> <fileset dir="../web" includes="*.log"/> - <fileset dir="../web" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/> + <fileset dir="../web" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt,output/cargo/*"/> </delete>  <delete includeEmptyDirs="true" quiet="true"> Modified: modules/web/trunk/tools/etc/buildfragments/buildmagic.ent =================================================================== --- modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-17 15:52:54 UTC (rev 8298) +++ modules/web/trunk/tools/etc/buildfragments/buildmagic.ent 2007-09-17 20:32:44 UTC (rev 8299) @@ -83,15 +83,24 @@  <property environment="env"/> -  - <condition property="jboss-4.2.home" value="${env.JBOSS_4_2_HOME}"> +  + + <condition property="jboss-4.2.0.home" value="${env.JBOSS_4_2_0_HOME}"> <and> <not> - <isset property="jboss-4.2.home"/> + <isset property="jboss-4.2.0.home"/> </not> - <isset property="env.JBOSS_4_2_HOME"/> + <isset property="env.JBOSS_4_2_0_HOME"/> </and> </condition> + <condition property="jboss-4.2.1.home" value="${env.JBOSS_4_2_1_HOME}"> + <and> + <not> + <isset property="jboss-4.2.1.home"/> + </not> + <isset property="env.JBOSS_4_2_1_HOME"/> + </and> + </condition>  <condition property="tomcat-6.0.home" value="${env.TOMCAT_6_0_HOME}"> Modified: modules/web/trunk/web/build.xml =================================================================== --- modules/web/trunk/web/build.xml 2007-09-17 15:52:54 UTC (rev 8298) +++ modules/web/trunk/web/build.xml 2007-09-17 20:32:44 UTC (rev 8299) @@ -322,7 +322,7 @@ </taskdef> </target> - <target name="cargo.jboss.start" depends="cargo.setup"> + <target name="cargo.jboss-4.2.start" depends="cargo.setup">  <cargo containerId="jboss42x" - home="${jboss-4.2.home}" - output="${cargo.log.dir}/cargo.jboss.server.log" - log="${cargo.log.dir}/cargo.jboss.log" + home="${test.jboss-4.2.home}" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" action="start" wait="${cargo.wait}"> <sharedClasspath> @@ -350,11 +350,11 @@ </cargo> </target> - <target name="cargo.jboss.stop" depends="cargo.setup"> + <target name="cargo.jboss-4.2.stop" depends="cargo.setup"> <cargo containerId="jboss42x" - home="${jboss-4.2.home}" - log="${cargo.log.dir}/cargo.jboss.log" + home="${test.jboss-4.2.home}" + log="${cargo.log.dir}/cargo.${test.id}.startup.log" action="stop"> <configuration> <property name="cargo.rmi.port" value="1099"/> @@ -362,12 +362,85 @@ </cargo> </target> - <target name="cargo.tomcat.start" depends="cargo.setup"> + <target name="tests.jboss-4.2.container-servlet" depends="init" if="${test.jboss-4.2.home.variable-name}"> + <echo message="Starting JBoss 4.2 container-servlet tests with ${test.jboss-4.2.home}"/> + <antcall target="cargo.jboss-4.2.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${build.lib}/jboss-4.2-container-servlet/test-spi-server.war"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="${test.jboss-4.2.name}"/> + <param name="test.deploy.dir" value="${build.lib}/jboss-4.2-container-servlet"/> + </antcall> + <antcall target="cargo.jboss-4.2.stop"> + </antcall> + </target> + + <target name="tests.jboss-4.2.generic" depends="init" if="${test.jboss-4.2.home.variable-name}"> + <echo message="Starting JBoss 4.2 generic tests with ${test.jboss-4.2.home}"/> + <antcall target="cargo.jboss-4.2.start"> + <param name="cargo.wait" value="false"/> + <param name="test.spi.server.path" value="${build.lib}/jboss-4.2-generic/test-spi-server.war"/> + </antcall> + <antcall target="tests.remote"> + <param name="test.server.name" value="${test.jboss-4.2.name}"/> + <param name="test.deploy.dir" value="${build.lib}/jboss-4.2-generic"/> + </antcall> + <antcall target="cargo.jboss-4.2.stop"> + </antcall> + </target> + + <target name="tests.jboss-4.2" depends="init"> + + <fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME"> + <condition> + <and> + <not> + <isset property="jboss-4.2.0.home"/> + </not> + <not> + <isset property="jboss-4.2.1.home"/> + </not> + </and> + </condition> + </fail> + + <antcall target="tests.jboss-4.2.container-servlet"> + <param name="test.id" value="JBoss-4_2_0-container-servlet"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> + <param name="test.jboss-4.2.home" value="${jboss-4.2.0.home}"/> + <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.0.home"/> + </antcall> + + <antcall target="tests.jboss-4.2.container-servlet"> + <param name="test.id" value="JBoss-4_2_1-container-servlet"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_1"/> + <param name="test.jboss-4.2.home" value="${jboss-4.2.1.home}"/> + <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.1.home"/> + </antcall> + + <antcall target="tests.jboss-4.2.generic"> + <param name="test.id" value="JBoss-4_2_0-generic"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_0"/> + <param name="test.jboss-4.2.home" value="${jboss-4.2.0.home}"/> + <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.0.home"/> + </antcall> + + <antcall target="tests.jboss-4.2.generic"> + <param name="test.id" value="JBoss-4_2_1-generic"/> + <param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_1"/> + <param name="test.jboss-4.2.home" value="${jboss-4.2.1.home}"/> + <param name="test.jboss-4.2.home.variable-name" value="jboss-4.2.1.home"/> + </antcall> + + </target> + + <target name="cargo.tomcat-6.start" depends="cargo.setup"> <cargo - containerId="tomcat5x" - home="${tomcat-6.0.home}" - output="${cargo.log.dir}/cargo.tomcat.server.log" - log="${cargo.log.dir}/cargo.tomcat.log" + containerId="tomcat5x" + home="${test.tomcat-6.home}" + output="${cargo.log.dir}/cargo.${test.id}.server.log" + log="${cargo.log.dir}/cargo.${test.id}.start.log" action="start" wait="${cargo.wait}"> <sharedClasspath> @@ -381,106 +454,85 @@ <configuration> <property name="cargo.servlet.port" value="8080"/> <property name="cargo.logging" value="high"/> -  - <deployable type="war" file="${codehaus.cargo.lib}/manager.war"/> <deployable type="war" file="${test.spi.server.path}"/> </configuration> </cargo> </target> - <target name="cargo.tomcat.stop" depends="cargo.setup"> + <target name="cargo.tomcat-6.stop" depends="cargo.setup"> <cargo containerId="tomcat5x" - home="${tomcat-6.0.home}" - log="${cargo.log.dir}/cargo.tomcat.log" + home="${test.tomcat-6.home}" + log="${cargo.log.dir}/cargo.${test.id}.shutdown.log" action="stop"> <configuration> </configuration> </cargo> </target> - <target name="tests" depends="init"> - <antcall target="tests.local"/> - <antcall target="tests.jboss.container-servlet"/> - <antcall target="tests.jboss.generic"/> - <antcall target="tests.tomcat.container-servlet"/> - <antcall target="tests.tomcat.generic"/> - </target> + <target name="tests.tomcat-6" depends="init"> - <target name="tests.jboss" depends="init"> - <antcall target="tests.jboss.container-servlet"/> - </target> + <fail message="Please set the environment variable JBOSS_6_0_HOME"> + <condition> + <and> + <not> + <isset property="tomcat-6.0.home"/> + </not> + </and> + </condition> + </fail> - <target name="tests.jboss.container-servlet" depends="init"> - <fail unless="jboss-4.2.home" message="Please set the environment variable JBOSS_4_2_HOME"/> - <echo message="Starting JBoss 4.2 tests with ${jboss-4.2.home}"/> - <antcall target="cargo.jboss.start"> - <param name="cargo.wait" value="false"/> - <param name="test.spi.server.path" value="${build.lib}/jboss-4.2-container-servlet/test-spi-server.war"/> + <antcall target="tests.tomcat-6.container-servlet"> + <param name="test.id" value="Tomcat-6_0-container-servlet"/> + <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> + <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> + <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> </antcall> - <antcall target="tests.remote"> - <param name="test.server.name" value="RemoteJBoss_4_2"/> - <param name="test.deploy.dir" value="${build.lib}/jboss-4.2-container-servlet"/> - <param name="test.type" value="container-servlet"/> + <antcall target="tests.tomcat-6.generic"> + <param name="test.id" value="Tomcat-6_0-generic"/> + <param name="test.tomcat-6.name" value="RemoteTomcat_6_0"/> + <param name="test.tomcat-6.home" value="${tomcat-6.0.home}"/> + <param name="test.tomcat-6.home.variable-name" value="tomcat-6.0.home"/> </antcall> - <antcall target="cargo.jboss.stop"> - </antcall> </target> - <target name="tests.jboss.generic" depends="init"> - <fail unless="jboss-4.2.home" message="Please set the environment variable JBOSS_4_2_HOME"/> - <echo message="Starting JBoss 4.2 tests with ${jboss-4.2.home}"/> - <antcall target="cargo.jboss.start"> + <target name="tests.tomcat-6.container-servlet" depends="init" if="${test.tomcat-6.home.variable-name}"> + <echo message="Starting Tomcat 6 container-servlet tests with ${test.tomcat-6.home}"/> + <antcall target="cargo.tomcat-6.start"> <param name="cargo.wait" value="false"/> - <param name="test.spi.server.path" value="${build.lib}/jboss-4.2-generic/test-spi-server.war"/> - </antcall> - <antcall target="tests.remote"> - <param name="test.server.name" value="RemoteJBoss_4_2"/> - <param name="test.deploy.dir" value="${build.lib}/jboss-4.2-generic"/> - <param name="test.type" value="generic"/> - </antcall> - <antcall target="cargo.jboss.stop"> - </antcall> - </target> - - <target name="tests.tomcat" depends="init"> - <antcall target="tests.tomcat.container-servlet"/> - </target> - - <target name="tests.tomcat.container-servlet" depends="init"> - <fail unless="tomcat-6.0.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> - <echo message="Starting Tomcat 6.0 tests with ${tomcat-6.0.home}"/> - <antcall target="cargo.tomcat.start"> - <param name="cargo.wait" value="false"/> <param name="test.spi.server.path" value="${build.lib}/tomcat-6.0-container-servlet/test-spi-server.war"/> </antcall> <antcall target="tests.remote"> <param name="test.server.name" value="RemoteTomcat_6_0"/> <param name="test.deploy.dir" value="${build.lib}/tomcat-6.0-container-servlet"/> - <param name="test.type" value="container-servlet"/> </antcall> - <antcall target="cargo.tomcat.stop"> + <antcall target="cargo.tomcat-6.stop"> </antcall> </target> - <target name="tests.tomcat.generic" depends="init"> - <fail unless="tomcat-6.0.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> - <echo message="Starting Tomcat 6.0 tests with ${tomcat-6.0.home}"/> - <antcall target="cargo.tomcat.start"> + <target name="tests.tomcat-6.generic" depends="init" if="${test.tomcat-6.home.variable-name}"> + <fail unless="test.tomcat-6.home" message="Please set the environment variable TOMCAT_6_0_HOME"/> + <echo message="Starting Tomcat 6 generic tests with ${test.tomcat-6.home}"/> + <antcall target="cargo.tomcat-6.start"> <param name="cargo.wait" value="false"/> <param name="test.spi.server.path" value="${build.lib}/tomcat-6.0-generic/test-spi-server.war"/> </antcall> <antcall target="tests.remote"> <param name="test.server.name" value="RemoteTomcat_6_0"/> <param name="test.deploy.dir" value="${build.lib}/tomcat-6.0-generic"/> - <param name="test.type" value="generic"/> </antcall> - <antcall target="cargo.tomcat.stop"> + <antcall target="cargo.tomcat-6.stop"> </antcall> </target> + <target name="tests" depends="init"> + <antcall target="tests.local"/> + <antcall target="tests.jboss-4.2"/> + <antcall target="tests.tomcat-6"/> + </target> + <target name="tests.local" depends="init"> <execute-tests> <x-test> @@ -526,8 +578,8 @@ <zest todir="${test.reports}" name="org.jboss.portal.test.web.spi.SPITestCase" - outfile="TEST-${test.server.name}-${test.type}.org.jboss.portal.test.web.spi.SPITestCase" - id="org.jboss.portal.test.web.spi.SPITestCase,serverName=${test.server.name},type=${test.type}"> + outfile="TEST-${test.id}.org.jboss.portal.test.web.spi.SPITestCase" + id="org.jboss.portal.test.web.spi.SPITestCase,${test.id}"> <parameter name="serverName" value="${test.server.name}"/> </zest> </x-test> Modified: modules/web/trunk/web/src/resources/test/config/servers.xml =================================================================== --- modules/web/trunk/web/src/resources/test/config/servers.xml 2007-09-17 15:52:54 UTC (rev 8298) +++ modules/web/trunk/web/src/resources/test/config/servers.xml 2007-09-17 20:32:44 UTC (rev 8299) @@ -22,7 +22,7 @@ </node> </server> <server> - <server-name>RemoteJBoss_4_2</server-name> + <server-name>RemoteJBoss_4_2_0</server-name> <node> <node-id>default</node-id> <service> @@ -39,4 +39,22 @@ </deployer> </node> </server> + <server> + <server-name>RemoteJBoss_4_2_1</server-name> + <node> + <node-id>default</node-id> + <service> + <service-name>TestDriverServer</service-name> + <interface>org.jboss.portal.test.framework.driver.remote.RemoteTestDriver</interface> + <uri>socket://localhost:5400</uri> + </service> + <deployer> + <remote> + <name>jboss4x</name> + <host>localhost</host> + <port>8080</port> + </remote> + </deployer> + </node> + </server> </servers>

18 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r8298 - modules/common/trunk/common.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2007-09-17 11:52:54 -0400 (Mon, 17 Sep 2007) New Revision: 8298 Modified: modules/common/trunk/common/build.xml Log: added default test compile target Modified: modules/common/trunk/common/build.xml =================================================================== --- modules/common/trunk/common/build.xml 2007-09-16 18:17:35 UTC (rev 8297) +++ modules/common/trunk/common/build.xml 2007-09-17 15:52:54 UTC (rev 8298) @@ -113,6 +113,7 @@ description="Compile all source files." depends="generate-parsers, _default:compile-classes, + _default:compile-test-classes, _default:compile-etc, _default:compile-resources">  @@ -190,9 +191,8 @@ <target name="tests" depends="init"> + <execute-tests> - <execute-tests> - <x-sysproperty> <!-- <jvmarg value="-Xdebug"/>

18 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r8297 - in trunk/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 2 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-09-16 14:17:35 -0400 (Sun, 16 Sep 2007) New Revision: 8297 Added: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_CreateInstance.gif Modified: trunk/core-admin/src/bin/portal-admin-war/style.css trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml Log: - JBPORTAL-1642: added create instance icon, better styling of object path, several style improvements (thanks, Meriah!) - JBPORTAL-1650: fixed theme pages. - JBPORTAL-1696, JBPORTAL-1697, JBPORTAL-1698: added proper classes and associated styling. Modified: trunk/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-16 18:11:19 UTC (rev 8296) +++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-09-16 18:17:35 UTC (rev 8297) @@ -1,5 +1,15 @@ /* Redefine spacing for tables. */ +a { + color: #446688; + text-decoration: none; +} + +a:hover { + color: #5078aa; + text-decoration: underline; +} + .admin-ui table { border: 0; } @@ -30,14 +40,12 @@ list-style-type: none; display: inline; margin-right: 2px; - border: 1px solid; } .admin-ui ul.pagination li.selected { font-weight: bold; background-color: #eef; - border: 1px solid black; - border-bottom: 3px solid black; + border-bottom: 2px solid #656565; } .pagination a, .pagination a:visited, .pagination a:hover { @@ -49,7 +57,7 @@ .admin-ui ul.topnav { margin-left: 0; padding: 4px 0px 3px; - border-bottom: 1px solid #dfe8ed; + border-bottom: 1px solid #b3c0c7; } .admin-ui ul.topnav li { @@ -58,7 +66,7 @@ margin: 0; padding: 3px 0.5em; margin-left: 5px; - border: 1px solid #dfe8ed; + border: 1px solid #b3c0c7; border-bottom: none; background-color: #f2f4f5; } @@ -78,20 +86,59 @@ /* Object path. */ .admin-ui ul.objectpath { - margin: 0; - padding: 5px 0px 5px 0px; + list-style-type: none; + font-size: 11px; + border: solid 1px #bbb; + border-left: solid 1px #eee; + border-right: solid 1px #eee; + background-color: #d5d5d5; + background-image: url( img/pathBackground.png ); + background-position: left; + background-repeat: repeat-x; + height: 21px; + margin: 0px; + padding: 0px; + padding-left: 2px; } .admin-ui ul.objectpath li { list-style-type: none; - display: inline; - margin-right: 3px; + display: block; + float: left; } +.admin-ui ul li.pathItem { + padding-top: 4px; + padding-left: 3px; + padding-right: 2px; +} + +/* +.admin-ui ul.li.pathSeparator { + background-image: url(img/pathSeparator.png); + background-position: center center; + background-repeat: no-repeat; + width: 7px; +} +*/ + .admin-ui ul.objectpath li.selected { font-weight: bold; + padding-top: 4px; + padding-left: 3px; + padding-right: 2px; } +.admin-ui ul.objectpath a { + color: #333333; + text-decoration: none; +} + +.admin-ui ul.objectpath a:hover { + color: #5078aa; + text-decoration: none; +} + /* Resize combo lists */ .admin-ui select { padding: 2px 4px 2px 1px; @@ -140,7 +187,7 @@ .admin-ui .portlet-area-body { border: 1px solid #d5d5d5; - border-top: 0; + border-top: 0px; background-color: #fff; padding: 4px; margin: 0; @@ -157,6 +204,170 @@ padding-left: 6px; } +.admin-ui h3.sectionTitle { + font-weight: bold; + color: #656565; + font-size: 11px; + border-top: 1px solid #999; + background-color: #ebf2f5; + padding: 2px; + padding-left: 4px; +} + +.admin-ui .portlet-section-header { + background-image: url( img/pathBackground.png ); + background-position: left; + background-repeat: repeat-x; + font-weight: bold; + color: #656565; + font-size: 10px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #999; + padding-left: 4px; +} + +.admin-ui .portlet-section-header th { + background-image: url( img/pathBackground.png ); + background-position: left; + background-repeat: repeat-x; + font-weight: bold; + color: #656565; + font-size: 10px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #999; + padding-left: 4px; +} + +.admin-ui .portlet-section-body { + color: #656565; + border: 1px solid #d5d5d5; + border-top: 0px; +} + +.admin-ui .portlet-section-alternate { + background-color: #F2F2F2; + border: 1px solid #d5d5d5; +} + +.admin-ui .portlet-section-selected { + background-color: #CBD4E6; +} + +.admin-ui .actionDetails { + background-image: url( img/actionIcon_Details.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionLayout { + background-image: url( img/actionIcon_Layout.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionSecurity { + background-image: url( img/actionIcon_Security.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionProperties { + background-image: url( img/actionIcon_Properties.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + padding-left: 18px; + white-space: nowrap; + height: 22px; +} + +.admin-ui .actionTheme { + background-image: url( img/actionIcon_Theme.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionRename { + background-image: url( img/actionIcon_Rename.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionDelete { + background-image: url( img/actionIcon_Delete.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionMakeDefault { + background-image: url( img/actionIcon_MakeDefault.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionDefault { + background-image: url( img/actionIcon_IsDefault.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionPreferences { + background-image: url( img/actionIcon_Properties.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionCreateInstance { + background-image: url( img/actionIcon_CreateInstance.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + .admin-ui .portlet-content-center { padding: 0; margin: 0; @@ -239,14 +450,14 @@ padding: 1em 0 0 0; } -.admin-ui .objectName:before { - content: "'"; +.admin-ui .objectList { + width: 100%; } -.admin-ui .objectName:after { - content: "'"; +.admin-ui .objectList .objectNameColumn { + width: 25%; } -.admin-ui .objectName { - font-style: italic; +.admin-ui .objectList .objectActionColumn { + width: 75%; } \ No newline at end of file Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-09-16 18:11:19 UTC (rev 8296) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-09-16 18:17:35 UTC (rev 8297) @@ -19,7 +19,7 @@ <h:form> <table width="100%"> -<thead class="portlet-section-header" style="text-align:left;"> +<thead class="portlet-section-header"> <tr> <th>Case</th> <th>Inheritance</th> @@ -45,7 +45,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.pageControlUnavailable.displayName}"/> </td> @@ -81,7 +81,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.pageControlInternalError.displayName}"/> </td> @@ -117,7 +117,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.pageControlResourceURI.displayName}"/> </td> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-09-16 18:11:19 UTC (rev 8296) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-09-16 18:17:35 UTC (rev 8297) @@ -19,7 +19,7 @@ <h:form> <table width="100%"> -<thead class="portlet-section-header" style="text-align:left;"> +<thead class="portlet-section-header"> <tr> <th>Case</th> <th>Inheritance</th> @@ -46,7 +46,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.portalControlUnavailable.displayName}"/> </td> @@ -83,7 +83,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.portalControlInternalError.displayName}"/> </td> @@ -120,7 +120,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.portalControlResourceURI.displayName}"/> </td> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-09-16 18:11:19 UTC (rev 8296) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-09-16 18:17:35 UTC (rev 8297) @@ -80,7 +80,7 @@ <h:form>  - <h:dataTable value="#{properties.entries}" + <h:dataTable value="#{properties.entries}" width="100%" rowClasses="portlet-section-body, portlet-section-alternate" var="prop"> <h:column> <f:facet name="header">Name</f:facet> @@ -107,7 +107,7 @@ <f:facet name="header">Delete</f:facet> <h:commandLink action="#{properties.action.removeProperty}" rendered="#{!prop.inherited}"> - <h:outputText value="Delete"/> + <h:outputText styleClass="actionDelete" value="Delete"/> <f:param name="name" value="#{prop.name}"/> </h:commandLink> </h:column> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-09-16 18:11:19 UTC (rev 8296) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-09-16 18:17:35 UTC (rev 8297) @@ -1,53 +1,45 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core"> +<div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <h:panelGroup styleClass="portlet-section-body" id="themepg"> - <h:form id="themeform"> - <table> - <thead class="portlet-section-header"> - <tr> - <th>Name</th> - <th>Description</th> - <th>Setting</th> - </tr> - </thead> - <tbody> - <tr class="portlet-section-body"> - <td><h:outputLabel styleClass="portlet-form-field-label" for="layout">Layout</h:outputLabel></td> - <td>Name of the layout implementation used to arrange portlet windows in pages</td> - <td> - <h:selectOneMenu id="layout" value="#{theme.layoutName}"> - <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-alternate"> - <td><h:outputLabel styleClass="portlet-form-field-label" for="theme">Theme</h:outputLabel></td> - <td>Name of the look and feel to use</td> - <td> - <h:selectOneMenu id="theme" value="#{theme.themeName}"> - <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td><h:outputLabel styleClass="portlet-form-field-label" for="renderSet">RenderSet</h:outputLabel> - </td> - <td>Name of the render engine to use to render pages</td> - <td> - <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> - </tbody> - </table> - - <br/> - <ui:insert name="form_submit"/> - </h:form> - </h:panelGroup> + <h:form> + <table width="100%"> + <thead class="portlet-section-header"> + <tr> + <th>Name</th> + <th>Description</th> + <th>Setting</th> + </tr> + </thead> + <tbody> + <tr class="portlet-section-body"> + <td>Layout</td> + <td>Name of the layout implementation used to arrange portlet windows in pages</td> + <td> + <h:selectOneMenu id="layout" value="#{theme.layoutName}"> + <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-alternate"> + <td>Theme</td> + <td>Name of the look and feel to use</td> + <td> + <h:selectOneMenu id="theme" value="#{theme.themeName}"> + <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-body"> + <td>RenderSet</td> + <td>Name of the render engine to use to render pages</td> + <td> + <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + </tbody> + </table> + <ui:insert name="form_submit"/> + </h:form> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-09-16 18:11:19 UTC (rev 8296) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-09-16 18:17:35 UTC (rev 8297) @@ -4,55 +4,45 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <h:panelGroup styleClass="portlet-section-body" id="themepg"> - <h:form id="themeform"> - <table> - <thead class="portlet-section-header"> - <tr> - <th>Name</th> - <th>Description</th> - <th>Setting</th> - </tr> - </thead> - <tbody> - <tr class="portlet-section-body"> - <td><h:outputLabel for="windowRenderer" styleClass="portlet-form-field-label">Window - Renderer</h:outputLabel></td> - <td>Name of the render engine to use to render windows</td> - <td> - <h:selectOneMenu id="windowRenderer" styleClass="portlet-form-field" - value="#{theme.windowRendererName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-alternate"> - <td><h:outputLabel for="decorationRenderer" styleClass="portlet-form-field-label">Decoration - Renderer</h:outputLabel></td> - <td>Name of the render engine to use to render window decorations</td> - <td> - <h:selectOneMenu id="decorationRenderer" styleClass="portlet-form-field" - value="#{theme.decorationRendererName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td><h:outputLabel for="portletRenderer" styleClass="portlet-form-field-label">Portlet - Renderer</h:outputLabel></td> - <td>Name of the render engine to use to render portlets</td> - <td> - <h:selectOneMenu id="portletRenderer" styleClass="portlet-form-field" - value="#{theme.portletRendererName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> - </tbody> - </table> - - <br/> - <ui:insert name="form_submit"/> - </h:form> - </h:panelGroup> + <h:form> + <table width="100%"> + <thead class="portlet-section-header"> + <tr> + <th>Name</th> + <th>Description</th> + <th>Setting</th> + </tr> + </thead> + <tbody> + <tr class="portlet-section-body"> + <td>Window Renderer</td> + <td>Name of the render engine to use to render windows</td> + <td> + <h:selectOneMenu id="windowRenderer" value="#{theme.windowRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-alternate"> + <td>Decoration Renderer</td> + <td>Name of the render engine to use to render window decorations</td> + <td> + <h:selectOneMenu id="decorationRenderer" value="#{theme.decorationRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td>Portlet Renderer</td> + <td>Name of the render engine to use to render portlets</td> + <td> + <h:selectOneMenu id="portletRenderer" value="#{theme.portletRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + </tbody> + </table> + <ui:insert name="form_submit"/> + </h:form> </div> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-16 18:11:19 UTC (rev 8296) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-16 18:17:35 UTC (rev 8297) @@ -16,7 +16,7 @@ <h:commandLink action="instances">Portlet Instances</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> - <li class="selected actionDelete"> + <li class="selected"> <span class="objectName">#{instancemgr.selectedInstance.id}</span> instance Delete </li> </ul> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-09-16 18:11:19 UTC (rev 8296) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-09-16 18:17:35 UTC (rev 8297) @@ -28,19 +28,24 @@  <br/> - <div class="portlet-area-header">Dashboard theme properties</div> - <div class="portlet-area-body"> - The settings defined here will be applied to the dashboards including all the pages and windows unless they - have been assigned with different settings. - <ui:decorate template="common/editTheme.xhtml"> - <ui:param name="theme" value="#{dashboardmgr.theme}"/> - <ui:define name="form_submit"> - <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" - styleClass="portlet-form-button"/> - </ui:define> - </ui:decorate> - </div> + <p class="portlet-area-header">Dashboard theme properties</p> + <table cellpadding="0" cellspacing="0" width="100%" class="portlet-area-body"> + <tr> + <th class="portlet-section-title">Configure dashboards settings.</th> + </tr> + <tr> + <td valign="top" class="portlet-section-body"> + <ui:decorate template="common/editTheme.xhtml"> + <ui:param name="theme" value="#{dashboardmgr.theme}"/> + <ui:define name="form_submit"> + <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + </ui:define> + </ui:decorate> + </td> + </tr> + </table> </ui:define> </ui:composition> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-09-16 18:11:19 UTC (rev 8296) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-09-16 18:17:35 UTC (rev 8297) @@ -11,9 +11,9 @@ <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" - styleClass="portlet-form-button"/> + styleClass="portlet-form-button portlet-section-buttonrow"/> <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" - styleClass="portlet-form-button"> + styleClass="portlet-form-button portlet-section-buttonrow"> <f:param name="id" value="#{node.id}"/> </h:commandButton> </ui:define> Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-09-16 18:11:19 UTC (rev 8296) +++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-09-16 18:17:35 UTC (rev 8297) @@ -9,8 +9,10 @@ <h:form> <c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> - <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}" - rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}" styleClass="objectList" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> <h:column> <f:facet name="header"> <h:outputText value="Portal"/> @@ -60,8 +62,10 @@ </c:if> <c:if test="#{not empty portalobjectmgr.selectedObject.pages}"> - <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}" - rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}" styleClass="objectList" + columnClasses="objectNameColumn, objectActionColumn" + rowClasses="portlet-section-body,portlet-section-alternate" + headerClass="portlet-section-header"> <h:column> <f:facet name="header"> <h:outputText value="Page"/> @@ -114,8 +118,10 @@ <c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> <h3 class="sectionTitle">Manage windows within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> - <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" - rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" styleClass="objectList" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> <h:column> <f:facet name="header"> <h:outputText value="Window"/> Copied: trunk/core-admin/src/resources/portal-admin-war/img/actionIcon_CreateInstance.gif (from rev 8296, branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_CreateInstance.gif) =================================================================== (Binary files differ)

18 years, 7 months

1
0
0 / 0

JBoss Portal SVN: r8296 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 2 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-09-16 14:11:19 -0400 (Sun, 16 Sep 2007) New Revision: 8296 Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_CreateInstance.gif Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml Log: - JBPORTAL-1642: added create instance icon, better styling of object path, several style improvements (thanks, Meriah!) - JBPORTAL-1650: fixed theme pages. - JBPORTAL-1696, JBPORTAL-1697, JBPORTAL-1698: added proper classes and associated styling. Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/bin/portal-admin-war/style.css 2007-09-16 18:11:19 UTC (rev 8296) @@ -1,5 +1,15 @@ /* Redefine spacing for tables. */ +a { + color: #446688; + text-decoration: none; +} + +a:hover { + color: #5078aa; + text-decoration: underline; +} + .admin-ui table { border: 0; } @@ -30,14 +40,12 @@ list-style-type: none; display: inline; margin-right: 2px; - border: 1px solid; } .admin-ui ul.pagination li.selected { font-weight: bold; background-color: #eef; - border: 1px solid black; - border-bottom: 3px solid black; + border-bottom: 2px solid #656565; } .pagination a, .pagination a:visited, .pagination a:hover { @@ -49,7 +57,7 @@ .admin-ui ul.topnav { margin-left: 0; padding: 4px 0px 3px; - border-bottom: 1px solid #dfe8ed; + border-bottom: 1px solid #b3c0c7; } .admin-ui ul.topnav li { @@ -58,7 +66,7 @@ margin: 0; padding: 3px 0.5em; margin-left: 5px; - border: 1px solid #dfe8ed; + border: 1px solid #b3c0c7; border-bottom: none; background-color: #f2f4f5; } @@ -78,20 +86,59 @@ /* Object path. */ .admin-ui ul.objectpath { - margin: 0; - padding: 5px 0px 5px 0px; + list-style-type: none; + font-size: 11px; + border: solid 1px #bbb; + border-left: solid 1px #eee; + border-right: solid 1px #eee; + background-color: #d5d5d5; + background-image: url( img/pathBackground.png ); + background-position: left; + background-repeat: repeat-x; + height: 21px; + margin: 0px; + padding: 0px; + padding-left: 2px; } .admin-ui ul.objectpath li { list-style-type: none; - display: inline; - margin-right: 3px; + display: block; + float: left; } +.admin-ui ul li.pathItem { + padding-top: 4px; + padding-left: 3px; + padding-right: 2px; +} + +/* +.admin-ui ul.li.pathSeparator { + background-image: url(img/pathSeparator.png); + background-position: center center; + background-repeat: no-repeat; + width: 7px; +} +*/ + .admin-ui ul.objectpath li.selected { font-weight: bold; + padding-top: 4px; + padding-left: 3px; + padding-right: 2px; } +.admin-ui ul.objectpath a { + color: #333333; + text-decoration: none; +} + +.admin-ui ul.objectpath a:hover { + color: #5078aa; + text-decoration: none; +} + /* Resize combo lists */ .admin-ui select { padding: 2px 4px 2px 1px; @@ -140,7 +187,7 @@ .admin-ui .portlet-area-body { border: 1px solid #d5d5d5; - border-top: 0; + border-top: 0px; background-color: #fff; padding: 4px; margin: 0; @@ -157,6 +204,170 @@ padding-left: 6px; } +.admin-ui h3.sectionTitle { + font-weight: bold; + color: #656565; + font-size: 11px; + border-top: 1px solid #999; + background-color: #ebf2f5; + padding: 2px; + padding-left: 4px; +} + +.admin-ui .portlet-section-header { + background-image: url( img/pathBackground.png ); + background-position: left; + background-repeat: repeat-x; + font-weight: bold; + color: #656565; + font-size: 10px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #999; + padding-left: 4px; +} + +.admin-ui .portlet-section-header th { + background-image: url( img/pathBackground.png ); + background-position: left; + background-repeat: repeat-x; + font-weight: bold; + color: #656565; + font-size: 10px; + border-top: 1px solid #ddd; + border-bottom: 1px solid #999; + padding-left: 4px; +} + +.admin-ui .portlet-section-body { + color: #656565; + border: 1px solid #d5d5d5; + border-top: 0px; +} + +.admin-ui .portlet-section-alternate { + background-color: #F2F2F2; + border: 1px solid #d5d5d5; +} + +.admin-ui .portlet-section-selected { + background-color: #CBD4E6; +} + +.admin-ui .actionDetails { + background-image: url( img/actionIcon_Details.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionLayout { + background-image: url( img/actionIcon_Layout.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionSecurity { + background-image: url( img/actionIcon_Security.gif ); + background-position: left; + background-repeat: no-repeat; + line-height: 14px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionProperties { + background-image: url( img/actionIcon_Properties.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + padding-left: 18px; + white-space: nowrap; + height: 22px; +} + +.admin-ui .actionTheme { + background-image: url( img/actionIcon_Theme.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionRename { + background-image: url( img/actionIcon_Rename.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionDelete { + background-image: url( img/actionIcon_Delete.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionMakeDefault { + background-image: url( img/actionIcon_MakeDefault.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionDefault { + background-image: url( img/actionIcon_IsDefault.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionPreferences { + background-image: url( img/actionIcon_Properties.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + +.admin-ui .actionCreateInstance { + background-image: url( img/actionIcon_CreateInstance.gif ); + background-position: left; + background-repeat: no-repeat; + padding-top: 2px; + padding-bottom: 2px; + line-height: 18px; + padding-left: 18px; + white-space: nowrap; +} + .admin-ui .portlet-content-center { padding: 0; margin: 0; @@ -239,15 +450,15 @@ padding: 1em 0 0 0; } -.admin-ui .objectName:before { - content: "'"; +.admin-ui .objectList { + width: 100%; } -.admin-ui .objectName:after { - content: "'"; +.admin-ui .objectList .objectNameColumn { + width: 25%; } -.admin-ui .objectName { - font-style: italic; +.admin-ui .objectList .objectActionColumn { + width: 75%; } Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPageErrorHandling.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -19,7 +19,7 @@ <h:form> <table width="100%"> -<thead class="portlet-section-header" style="text-align:left;"> +<thead class="portlet-section-header"> <tr> <th>Case</th> <th>Inheritance</th> @@ -45,7 +45,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.pageControlUnavailable.displayName}"/> </td> @@ -81,7 +81,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.pageControlInternalError.displayName}"/> </td> @@ -117,7 +117,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.pageControlResourceURI.displayName}"/> </td> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editPortalErrorHandling.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -19,7 +19,7 @@ <h:form> <table width="100%"> -<thead class="portlet-section-header" style="text-align:left;"> +<thead class="portlet-section-header"> <tr> <th>Case</th> <th>Inheritance</th> @@ -46,7 +46,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.portalControlUnavailable.displayName}"/> </td> @@ -83,7 +83,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.portalControlInternalError.displayName}"/> </td> @@ -120,7 +120,7 @@ </h:selectOneMenu> </td> </tr> -<tr class="portlet-section-body"> +<tr class="portlet-section-alternate"> <td> <h:outputText value="#{properties.portalControlResourceURI.displayName}"/> </td> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -80,7 +80,7 @@ <h:form>  - <h:dataTable value="#{properties.entries}" + <h:dataTable value="#{properties.entries}" width="100%" rowClasses="portlet-section-body, portlet-section-alternate" var="prop"> <h:column> <f:facet name="header">Name</f:facet> @@ -107,7 +107,7 @@ <f:facet name="header">Delete</f:facet> <h:commandLink action="#{properties.action.removeProperty}" rendered="#{!prop.inherited}"> - <h:outputText value="Delete"/> + <h:outputText styleClass="actionDelete" value="Delete"/> <f:param name="name" value="#{prop.name}"/> </h:commandLink> </h:column> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editTheme.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -1,53 +1,45 @@ -<div - xmlns="http://www.w3.org/1999/xhtml" - xmlns:ui="http://java.sun.com/jsf/facelets" - xmlns:h="http://java.sun.com/jsf/html" - xmlns:f="http://java.sun.com/jsf/core"> +<div xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" + xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <h:panelGroup styleClass="portlet-section-body" id="themepg"> - <h:form id="themeform"> - <table> - <thead class="portlet-section-header"> - <tr> - <th>Name</th> - <th>Description</th> - <th>Setting</th> - </tr> - </thead> - <tbody> - <tr class="portlet-section-body"> - <td><h:outputLabel styleClass="portlet-form-field-label" for="layout">Layout</h:outputLabel></td> - <td>Name of the layout implementation used to arrange portlet windows in pages</td> - <td> - <h:selectOneMenu id="layout" value="#{theme.layoutName}"> - <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-alternate"> - <td><h:outputLabel styleClass="portlet-form-field-label" for="theme">Theme</h:outputLabel></td> - <td>Name of the look and feel to use</td> - <td> - <h:selectOneMenu id="theme" value="#{theme.themeName}"> - <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-body"> - <td><h:outputLabel styleClass="portlet-form-field-label" for="renderSet">RenderSet</h:outputLabel> - </td> - <td>Name of the render engine to use to render pages</td> - <td> - <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> - </tbody> - </table> - - <br/> - <ui:insert name="form_submit"/> - </h:form> - </h:panelGroup> + <h:form> + <table width="100%"> + <thead class="portlet-section-header"> + <tr> + <th>Name</th> + <th>Description</th> + <th>Setting</th> + </tr> + </thead> + <tbody> + <tr class="portlet-section-body"> + <td>Layout</td> + <td>Name of the layout implementation used to arrange portlet windows in pages</td> + <td> + <h:selectOneMenu id="layout" value="#{theme.layoutName}"> + <f:selectItems value="#{applicationScope.LayoutService.layoutItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-alternate"> + <td>Theme</td> + <td>Name of the look and feel to use</td> + <td> + <h:selectOneMenu id="theme" value="#{theme.themeName}"> + <f:selectItems value="#{applicationScope.ThemeService.themeItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-body"> + <td>RenderSet</td> + <td>Name of the render engine to use to render pages</td> + <td> + <h:selectOneMenu id="renderSet" value="#{theme.renderSetName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + </tbody> + </table> + <ui:insert name="form_submit"/> + </h:form> </div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editWindowTheme.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -4,55 +4,45 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core"> - <h:panelGroup styleClass="portlet-section-body" id="themepg"> - <h:form id="themeform"> - <table> - <thead class="portlet-section-header"> - <tr> - <th>Name</th> - <th>Description</th> - <th>Setting</th> - </tr> - </thead> - <tbody> - <tr class="portlet-section-body"> - <td><h:outputLabel for="windowRenderer" styleClass="portlet-form-field-label">Window - Renderer</h:outputLabel></td> - <td>Name of the render engine to use to render windows</td> - <td> - <h:selectOneMenu id="windowRenderer" styleClass="portlet-form-field" - value="#{theme.windowRendererName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr class="portlet-section-alternate"> - <td><h:outputLabel for="decorationRenderer" styleClass="portlet-form-field-label">Decoration - Renderer</h:outputLabel></td> - <td>Name of the render engine to use to render window decorations</td> - <td> - <h:selectOneMenu id="decorationRenderer" styleClass="portlet-form-field" - value="#{theme.decorationRendererName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> - <tr> - <td><h:outputLabel for="portletRenderer" styleClass="portlet-form-field-label">Portlet - Renderer</h:outputLabel></td> - <td>Name of the render engine to use to render portlets</td> - <td> - <h:selectOneMenu id="portletRenderer" styleClass="portlet-form-field" - value="#{theme.portletRendererName}"> - <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> - </h:selectOneMenu> - </td> - </tr> - </tbody> - </table> - - <br/> - <ui:insert name="form_submit"/> - </h:form> - </h:panelGroup> + <h:form> + <table width="100%"> + <thead class="portlet-section-header"> + <tr> + <th>Name</th> + <th>Description</th> + <th>Setting</th> + </tr> + </thead> + <tbody> + <tr class="portlet-section-body"> + <td>Window Renderer</td> + <td>Name of the render engine to use to render windows</td> + <td> + <h:selectOneMenu id="windowRenderer" value="#{theme.windowRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr class="portlet-section-alternate"> + <td>Decoration Renderer</td> + <td>Name of the render engine to use to render window decorations</td> + <td> + <h:selectOneMenu id="decorationRenderer" value="#{theme.decorationRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + <tr> + <td>Portlet Renderer</td> + <td>Name of the render engine to use to render portlets</td> + <td> + <h:selectOneMenu id="portletRenderer" value="#{theme.portletRendererName}"> + <f:selectItems value="#{applicationScope.LayoutService.renderSetItems}"/> + </h:selectOneMenu> + </td> + </tr> + </tbody> + </table> + <ui:insert name="form_submit"/> + </h:form> </div> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/confirmDeleteInstance.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -16,7 +16,7 @@ <h:commandLink action="instances">Portlet Instances</h:commandLink> </li> <li class="pathSeparator"><h:graphicImage url="/img/pathSeparator.png" alt=">"/></li> - <li class="selected actionDelete"> + <li class="selected"> <span class="objectName">#{instancemgr.selectedInstance.id}</span> instance Delete </li> </ul> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/dashboards.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -28,19 +28,24 @@  <br/> - <div class="portlet-area-header">Dashboard theme properties</div> - <div class="portlet-area-body"> - The settings defined here will be applied to the dashboards including all the pages and windows unless they - have been assigned with different settings. - <ui:decorate template="common/editTheme.xhtml"> - <ui:param name="theme" value="#{dashboardmgr.theme}"/> - <ui:define name="form_submit"> - <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" - styleClass="portlet-form-button"/> - </ui:define> - </ui:decorate> - </div> + <p class="portlet-area-header">Dashboard theme properties</p> + <table cellpadding="0" cellspacing="0" width="100%" class="portlet-area-body"> + <tr> + <th class="portlet-section-title">Configure dashboards settings.</th> + </tr> + <tr> + <td valign="top" class="portlet-section-body"> + <ui:decorate template="common/editTheme.xhtml"> + <ui:param name="theme" value="#{dashboardmgr.theme}"/> + <ui:define name="form_submit"> + <h:commandButton value="Update" actionListener="#{dashboardmgr.theme.execute}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + </ui:define> + </ui:decorate> + </td> + </tr> + </table> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/editWindowTheme.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -11,9 +11,9 @@ <ui:param name="theme" value="#{portalobjectmgr.theme}"/> <ui:define name="form_submit"> <h:commandButton value="Update" action="objects" actionListener="#{portalobjectmgr.theme.execute}" - styleClass="portlet-form-button"/> + styleClass="portlet-form-button portlet-section-buttonrow"/> <h:commandButton value="Cancel" action="#{portalobjectmgr.selectObject}" - styleClass="portlet-form-button"> + styleClass="portlet-form-button portlet-section-buttonrow"> <f:param name="id" value="#{node.id}"/> </h:commandButton> </ui:define> Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-09-16 13:44:20 UTC (rev 8295) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/objectNavigation.xhtml 2007-09-16 18:11:19 UTC (rev 8296) @@ -9,8 +9,10 @@ <h:form> <c:if test="#{not empty portalobjectmgr.selectedObject.portals}"> - <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}" - rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.portals}" styleClass="objectList" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> <h:column> <f:facet name="header"> <h:outputText value="Portal"/> @@ -60,8 +62,10 @@ </c:if> <c:if test="#{not empty portalobjectmgr.selectedObject.pages}"> - <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}" - rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.pages}" styleClass="objectList" + columnClasses="objectNameColumn, objectActionColumn" + rowClasses="portlet-section-body,portlet-section-alternate" + headerClass="portlet-section-header"> <h:column> <f:facet name="header"> <h:outputText value="Page"/> @@ -114,8 +118,10 @@ <c:if test="#{not empty portalobjectmgr.selectedObject.windows}"> <h3 class="sectionTitle">Manage windows within <span class="objectName">#{portalobjectmgr.selectedObject.name}</span> #{portalobjectmgr.selectedObject.typeName}</h3> - <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" - rowClasses="portlet-section-body,portlet-section-alternate" headerClass="portlet-section-header"> + <h:dataTable var="object" value="#{portalobjectmgr.selectedObject.windows}" styleClass="objectList" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="objectNameColumn, objectActionColumn" + headerClass="portlet-section-header"> <h:column> <f:facet name="header"> <h:outputText value="Window"/> Added: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_CreateInstance.gif =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/img/actionIcon_CreateInstance.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

18 years, 7 months

1
0
0 / 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits September 2007