[givwenzen] r284 committed - merged patch from Marcin Erdmann of Grails FitNesse team to fix issue ...
givw...@googlecode.com
Author: wes.wi...@gmail.com
Date: Wed Mar 30 06:22:06 2011
Log: merged patch from Marcin Erdmann of Grails FitNesse team to fix
issue with classloader conflicts in GivWenZen/Grails FitNesse integration
http://code.google.com/p/givwenzen/source/detail?r=284
Modified:
/trunk/.idea/workspace.xml
/trunk/src/main/java/org/givwenzen/reflections/util/DescriptorHelper.java
=======================================
--- /trunk/.idea/workspace.xml Sun Jan 30 08:50:56 2011
+++ /trunk/.idea/workspace.xml Wed Mar 30 06:22:06 2011
@@ -17,6 +17,7 @@
<component name="ChangeListManager">
<list default="true" readonly="true"
id="a7562009-1d9c-4926-8d06-21e0dd192b7e" name="Default" comment="">
<change type="MODIFICATION"
beforePath="$PROJECT_DIR$/.idea/workspace.xml"
afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
+ <change type="MODIFICATION"
beforePath="$PROJECT_DIR$/src/main/java/org/givwenzen/reflections/util/DescriptorHelper.java"
afterPath="$PROJECT_DIR$/src/main/java/org/givwenzen/reflections/util/DescriptorHelper.java"
/>
</list>
<ignored path=".idea/workspace.xml" />
<ignored path="$USER_HOME_GRAILS$/" />
@@ -80,7 +81,17 @@
<favorites_list name="givwenzen" />
</component>
<component name="FileEditorManager">
- <leaf />
+ <leaf>
+ <file leaf-file-name="DescriptorHelper.java" pinned="false"
current="true" current-in-tab="true">
+ <entry
file="file://$PROJECT_DIR$/src/main/java/org/givwenzen/reflections/util/DescriptorHelper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="132" column="42" selection-start="4669"
selection-end="4669" vertical-scroll-proportion="0.95408165">
+ <folding />
+ </state>
+ </provider>
+ </entry>
+ </file>
+ </leaf>
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -171,7 +182,7 @@
</profile-state>
</entry>
</component>
- <component name="ProjectLevelVcsManager">
+ <component name="ProjectLevelVcsManager" settingsEditedManually="false">
<OptionsSetting value="true" id="Add" />
<OptionsSetting value="true" id="Remove" />
<OptionsSetting value="true" id="Checkin" />
@@ -198,6 +209,7 @@
<sortByType />
</navigator>
<panes>
+ <pane id="Scope" />
<pane id="Favorites" />
<pane id="PackagesPane" />
<pane id="ProjectPane">
@@ -208,9 +220,18 @@
<option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
</PATH>
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="givwenzen" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+ </PATH_ELEMENT>
+ <PATH_ELEMENT>
+ <option name="myItemId" value="main" />
+ <option name="myItemType"
value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+ </PATH_ELEMENT>
+ </PATH>
</subPane>
</pane>
- <pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
@@ -244,7 +265,7 @@
<property name="GoToClass.includeLibraries" value="false" />
<property name="options.splitter.details.proportions" value="0.2" />
<property name="GoToFile.includeJavaFiles" value="false" />
- <property name="options.lastSelected" value="project.propSubversion" />
+ <property name="options.lastSelected" value="http.proxy" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder3"
value="3" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder4"
value="4" />
<property
name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder1"
value="1" />
@@ -571,7 +592,6 @@
<option name="USER" value="" />
<option name="PASSWORD" value="" />
<option name="LAST_MERGED_REVISION" />
- <option name="UPDATE_RUN_STATUS" value="false" />
<option name="MERGE_DRY_RUN" value="false" />
<option name="MERGE_DIFF_USE_ANCESTRY" value="true" />
<option name="UPDATE_LOCK_ON_DEMAND" value="false" />
@@ -580,6 +600,7 @@
<option name="CHECK_NESTED_FOR_QUICK_MERGE" value="false" />
<option name="IGNORE_SPACES_IN_ANNOTATE" value="true" />
<option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" />
+ <option name="FORCE_UPDATE" value="false" />
<configuration
useDefault="false">$USER_HOME$/.subversion_IDEA</configuration>
<myIsUseDefaultProxy>true</myIsUseDefaultProxy>
<supportedVersion>125</supportedVersion>
@@ -592,18 +613,10 @@
<option name="myCopyRoot" value="$PROJECT_DIR$/src/examples" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="$PROJECT_DIR$/.idea" />
- <option name="myCopyRoot" value="$PROJECT_DIR$/.idea" />
- </SvnCopyRootSimple>
- <SvnCopyRootSimple>
<option name="myVcsRoot" value="$PROJECT_DIR$" />
<option name="myCopyRoot" value="$PROJECT_DIR$" />
</SvnCopyRootSimple>
<SvnCopyRootSimple>
- <option name="myVcsRoot" value="$PROJECT_DIR$/FitNesseRoot" />
- <option name="myCopyRoot" value="$PROJECT_DIR$/FitNesseRoot" />
- </SvnCopyRootSimple>
- <SvnCopyRootSimple>
<option name="myVcsRoot" value="$PROJECT_DIR$/src/main" />
<option name="myCopyRoot" value="$PROJECT_DIR$/src/main" />
</SvnCopyRootSimple>
@@ -651,22 +664,22 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
- <frame x="46" y="38" width="986" height="740" extended-state="0" />
- <editor active="false" />
+ <frame x="605" y="29" width="947" height="788" extended-state="0" />
+ <editor active="true" />
<layout>
- <window_info id="Changes" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.3260135" sideWeight="0.5" order="8" side_tool="false"
content_ui="tabs" />
+ <window_info id="Changes" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.325" sideWeight="0.5" order="8" side_tool="false"
content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="3" side_tool="false"
content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.24972497" sideWeight="0.65929204" order="1" side_tool="false"
content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.398641" sideWeight="0.5" order="3" side_tool="false"
content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3295583" sideWeight="0.5" order="11" side_tool="false"
content_ui="tabs" />
- <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3243243" sideWeight="0.5" order="9" side_tool="false"
content_ui="tabs" />
+ <window_info id="Messages" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true"
weight="0.3234375" sideWeight="0.5" order="9" side_tool="false"
content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32743362" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs"
/>
<window_info id="Maven Projects" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32893288" sideWeight="0.67477876" order="4" side_tool="false"
content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs"
/>
- <window_info id="Project" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3272727" sideWeight="0.660473" order="0" side_tool="false"
content_ui="tabs" />
+ <window_info id="Project" active="false" anchor="left"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32700893" sideWeight="0.675" order="0" side_tool="false"
content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33" sideWeight="0.5" order="10" side_tool="false"
content_ui="tabs" />
- <window_info id="Run" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.33952704" sideWeight="0.5" order="2" side_tool="false"
content_ui="tabs" />
+ <window_info id="Run" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.3390625" sideWeight="0.5" order="2" side_tool="false"
content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.25" sideWeight="0.5" order="5" side_tool="false"
content_ui="tabs" />
<window_info id="SVN Properties" active="false" anchor="bottom"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.32964602" sideWeight="0.5" order="7" side_tool="false"
content_ui="tabs" />
<window_info id="V1Details" active="false" anchor="right"
auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false"
weight="0.30514988" sideWeight="0.77329975" order="3" side_tool="false"
content_ui="tabs" />
@@ -692,8 +705,9 @@
<option name="ENABLE_BACKGROUND_PROCESSES" value="false" />
<option name="CHANGED_ON_SERVER_INTERVAL" value="60" />
<option name="SHOW_ONLY_CHANGED_IN_SELECTION_DIFF" value="true" />
+ <option name="CHECK_COMMIT_MESSAGE_SPELLING" value="true" />
<option name="FORCE_NON_EMPTY_COMMENT" value="false" />
- <option name="LAST_COMMIT_MESSAGE" value="removed test of intellij
commit changes" />
+ <option name="LAST_COMMIT_MESSAGE" value="merged patch from Marcin
Erdmann from Grails FitNesse project to fix class loader issues in
GivWenZen/Grails FitNesse integration." />
<option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" />
<option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" />
<option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" />
@@ -719,6 +733,7 @@
<MESSAGE value="update ant-build to run fitnesse tests, not satisfied
with this yet" />
<MESSAGE value="test of intellij commit" />
<MESSAGE value="removed test of intellij commit changes" />
+ <MESSAGE value="merged patch from Marcin Erdmann from Grails FitNesse
project to fix class loader issues in GivWenZen/Grails FitNesse
integration." />
</component>
<component name="XDebuggerManager">
<breakpoint-manager />
@@ -758,11 +773,6 @@
</buildFile>
</component>
<component name="editorHistoryManager">
- <entry
file="file://$PROJECT_DIR$/src/main/java/org/givwenzen/DomainStepFactory.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="35" column="31" selection-start="1085"
selection-end="1085" vertical-scroll-proportion="0.33214286" />
- </provider>
- </entry>
<entry
file="jar://$APPLICATION_HOME_DIR$/plugins/maven/lib/maven.jar!/org/jetbrains/idea/maven/dom/maven-4.0.0.xsd">
<provider selected="true" editor-type-id="text-editor">
<state line="1531" column="33" selection-start="74815"
selection-end="74815" vertical-scroll-proportion="0.020310633" />
@@ -830,14 +840,17 @@
</entry>
<entry file="file://$PROJECT_DIR$/givwenzen.properties">
<provider selected="true" editor-type-id="text-editor">
- <state line="4" column="0" selection-start="186"
selection-end="186" vertical-scroll-proportion="0.16528925">
- <folding />
- </state>
+ <state line="4" column="0" selection-start="186"
selection-end="186" vertical-scroll-proportion="0.16528925" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
- <state line="221" column="14" selection-start="10214"
selection-end="10214" vertical-scroll-proportion="0.25714287">
+ <state line="221" column="14" selection-start="10214"
selection-end="10214" vertical-scroll-proportion="0.25714287" />
+ </provider>
+ </entry>
+ <entry
file="file://$PROJECT_DIR$/src/main/java/org/givwenzen/reflections/util/DescriptorHelper.java">
+ <provider selected="true" editor-type-id="text-editor">
+ <state line="132" column="42" selection-start="4669"
selection-end="4669" vertical-scroll-proportion="0.95408165">
<folding />
</state>
</provider>
=======================================
---
/trunk/src/main/java/org/givwenzen/reflections/util/DescriptorHelper.java
Wed Dec 2 01:26:03 2009
+++
/trunk/src/main/java/org/givwenzen/reflections/util/DescriptorHelper.java
Wed Mar 30 06:22:06 2011
@@ -119,7 +119,7 @@
try {
String descriptor = typeNameToDescriptor(typeName);
- return Class.forName(descriptor);
+ return Class.forName(descriptor, true,
Thread.currentThread().getContextClassLoader());
} catch (ClassNotFoundException e) {
throw new ReflectionsException("could not resolve type " +
typeName, e);
}