- Revision
- 210
- Author
- mward
- Date
- 2007-07-01 21:24:07 -0500 (Sun, 01 Jul 2007)
Log Message
fixed intellij project files after latest file reorganization
Modified Paths
- trunk/core/core.iml
- trunk/core/src/main/ruby/org/codehaus/waffle/waffle.rb
- trunk/core/src/test/specs/org/codehaus/waffle/servlet/waffle_spec.rb
- trunk/examples/freemarker-example/freemarker-example.iml
- trunk/examples/jruby-example/jruby-example.iml
- trunk/examples/paranamer-example/paranamer-example.iml
- trunk/examples/simple-example/simple-example.iml
- trunk/plugins/rspec-maven-plugin/rspec-maven-plugin.iml
- trunk/root.iml
- trunk/waffle.ipr
Diff
Modified: trunk/core/core.iml (209 => 210)
--- trunk/core/core.iml 2007-07-01 18:30:33 UTC (rev 209) +++ trunk/core/core.iml 2007-07-02 02:24:07 UTC (rev 210) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="false" type="JAVA_MODULE" version="4"> +<module version="4" relativePaths="false" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="" /> <exclude-output />
Modified: trunk/core/src/main/ruby/org/codehaus/waffle/waffle.rb (209 => 210)
--- trunk/core/src/main/ruby/org/codehaus/waffle/waffle.rb 2007-07-01 18:30:33 UTC (rev 209) +++ trunk/core/src/main/ruby/org/codehaus/waffle/waffle.rb 2007-07-02 02:24:07 UTC (rev 210) @@ -46,21 +46,19 @@ while (attribute_names.hasMoreElements) name = attribute_names.nextElement - self[name.to_s] = @__context.get_attribute(name) if name.is_a? Symbol - self[name] = @__context.get_attribute(name) unless name.is_a? Symbol + # Store in hash but skip setting back to underlying context + self.store(name, @__context.get_attribute(name), true) end end - def []=(key, value) - @__context.set_attribute(key.to_s, value) if key.is_a? Symbol - @__context.set_attribute(key, value) unless key.is_a? Symbol - super + def store(key, value, skip=false) + @__context.set_attribute(key, value) unless skip # add to delegate + + super(key, value) end - def [](key) - return super(key.to_s) if key.is_a? Symbol - - return super(key) + def []=(key, value) + store(key, value) end def method_missing(symbol, *args)
Modified: trunk/core/src/test/specs/org/codehaus/waffle/servlet/waffle_spec.rb (209 => 210)
--- trunk/core/src/test/specs/org/codehaus/waffle/servlet/waffle_spec.rb 2007-07-01 18:30:33 UTC (rev 209) +++ trunk/core/src/test/specs/org/codehaus/waffle/servlet/waffle_spec.rb 2007-07-02 02:24:07 UTC (rev 210) @@ -1,5 +1,7 @@ require 'org/codehaus/waffle/waffle' +include_class 'java.util.Hashtable' + describe "Waffle::ScriptLoader module" do it "should use 'load' when path prefix begins with 'dir:'" do @@ -26,4 +28,25 @@ Waffle::ScriptLoader.instance_variable_get(:@__servlet_context).should == servlet_context end +end + +describe "Waffle::WebContext class" do + + it "initialize() should obtain all attribute name/values and add them to a Ruby Hash" do + table = Hashtable.new # Using Hashtable because we need to an enumerator for testing + table.put('foo', "junk") + table.put(:bar, "junk") + + original_context = mock('original context') + original_context.should_receive(:get_attribute_names).and_return(table.keys) + original_context.should_receive(:get_attribute).with('foo').and_return('key was a string') + original_context.should_receive(:get_attribute).with(:bar).and_return('key was a symbol') + + waffle_context = Waffle::WebContext.new(original_context) + + waffle_context.include?('foo').should == true + waffle_context.include?(:bar).should == true + + end + end \ No newline at end of file
Modified: trunk/examples/freemarker-example/freemarker-example.iml (209 => 210)
--- trunk/examples/freemarker-example/freemarker-example.iml 2007-07-01 18:30:33 UTC (rev 209) +++ trunk/examples/freemarker-example/freemarker-example.iml 2007-07-02 02:24:07 UTC (rev 210) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> +<module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="FacetManager"> <facet type="web" name="freemarker-example"> <configuration> @@ -301,6 +301,7 @@ </configuration> </facet> </component> + <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="" /> <exclude-output />
Modified: trunk/examples/jruby-example/jruby-example.iml (209 => 210)
--- trunk/examples/jruby-example/jruby-example.iml 2007-07-01 18:30:33 UTC (rev 209) +++ trunk/examples/jruby-example/jruby-example.iml 2007-07-02 02:24:07 UTC (rev 210) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> +<module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="FacetManager"> <facet type="web" name="jruby-example"> <configuration> @@ -233,6 +233,7 @@ </configuration> </facet> </component> + <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="" /> <exclude-output />
Modified: trunk/examples/paranamer-example/paranamer-example.iml (209 => 210)
--- trunk/examples/paranamer-example/paranamer-example.iml 2007-07-01 18:30:33 UTC (rev 209) +++ trunk/examples/paranamer-example/paranamer-example.iml 2007-07-02 02:24:07 UTC (rev 210) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> +<module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="FacetManager"> <facet type="web" name="paranamer-example"> <configuration> @@ -213,6 +213,7 @@ </configuration> </facet> </component> + <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="" /> <exclude-output />
Modified: trunk/examples/simple-example/simple-example.iml (209 => 210)
--- trunk/examples/simple-example/simple-example.iml 2007-07-01 18:30:33 UTC (rev 209) +++ trunk/examples/simple-example/simple-example.iml 2007-07-02 02:24:07 UTC (rev 210) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> +<module version="4" relativePaths="true" type="JAVA_MODULE"> <component name="FacetManager"> <facet type="web" name="simple-example"> <configuration> @@ -263,6 +263,7 @@ </configuration> </facet> </component> + <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="" /> <exclude-output />
Modified: trunk/plugins/rspec-maven-plugin/rspec-maven-plugin.iml (209 => 210)
--- trunk/plugins/rspec-maven-plugin/rspec-maven-plugin.iml 2007-07-01 18:30:33 UTC (rev 209) +++ trunk/plugins/rspec-maven-plugin/rspec-maven-plugin.iml 2007-07-02 02:24:07 UTC (rev 210) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="" /> <exclude-output />
Modified: trunk/root.iml (209 => 210)
--- trunk/root.iml 2007-07-01 18:30:33 UTC (rev 209) +++ trunk/root.iml 2007-07-02 02:24:07 UTC (rev 210) @@ -1,5 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<module relativePaths="true" type="JAVA_MODULE" version="4"> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> <component name="NewModuleRootManager" inherit-compiler-output="true"> <content url="" <excludeFolder url="" />
Modified: trunk/waffle.ipr (209 => 210)
--- trunk/waffle.ipr 2007-07-01 18:30:33 UTC (rev 209) +++ trunk/waffle.ipr 2007-07-02 02:24:07 UTC (rev 210) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project relativePaths="false" version="4"> +<project version="4" relativePaths="false"> <component name="AntConfiguration"> <defaultAnt bundledAnt="true" /> </component> @@ -53,15 +53,6 @@ </option> <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" /> <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" /> - <ADDITIONAL_INDENT_OPTIONS fileType="js"> - <option name="INDENT_SIZE" value="4" /> - <option name="CONTINUATION_INDENT_SIZE" value="8" /> - <option name="TAB_SIZE" value="4" /> - <option name="USE_TAB_CHARACTER" value="false" /> - <option name="SMART_TABS" value="false" /> - <option name="LABEL_INDENT_SIZE" value="0" /> - <option name="LABEL_INDENT_ABSOLUTE" value="false" /> - </ADDITIONAL_INDENT_OPTIONS> </value> </option> <option name="USE_PER_PROJECT_SETTINGS" value="true" /> @@ -85,12 +76,11 @@ <entry name="*.rb" /> </wildcardResourcePatterns> </component> + <component name="DataSourceManagerImpl" /> <component name="DependenciesAnalyzeManager"> <option name="myForwardDirection" value="false" /> </component> - <component name="DependencyValidationManager"> - <option name="SKIP_IMPORT_STATEMENTS" value="false" /> - </component> + <component name="DependencyValidationManager" /> <component name="EclipseCompilerSettings"> <option name="DEBUGGING_INFO" value="true" /> <option name="GENERATE_NO_WARNINGS" value="true" /> @@ -106,13 +96,14 @@ <option name="MAXIMUM_HEAP_SIZE" value="128" /> </component> <component name="EntryPointsManager"> - <entry_points version="2.0" /> + <entry_points /> </component> <component name="ExportToHTMLSettings"> <option name="PRINT_LINE_NUMBERS" value="false" /> <option name="OPEN_IN_BROWSER" value="false" /> <option name="OUTPUT_DIRECTORY" /> </component> + <component name="GUI Designer component loader factory" /> <component name="IdProvider" IDEtalkID="17C09C4E48D603859A3E90A0804ADC63" /> <component name="ImportConfiguration"> <option name="VENDOR" /> @@ -319,11 +310,13 @@ <module fileurl="file://$PROJECT_DIR$/examples/jruby-example/jruby-example.iml" filepath="$PROJECT_DIR$/examples/jruby-example/jruby-example.iml" /> <module fileurl="file://$PROJECT_DIR$/examples/paranamer-example/paranamer-example.iml" filepath="$PROJECT_DIR$/examples/paranamer-example/paranamer-example.iml" /> <module fileurl="file://$PROJECT_DIR$/root.iml" filepath="$PROJECT_DIR$/root.iml" /> - <module fileurl="file://$PROJECT_DIR$/rspec-maven-plugin/rspec-maven-plugin.iml" filepath="$PROJECT_DIR$/rspec-maven-plugin/rspec-maven-plugin.iml" /> + <module fileurl="file://$PROJECT_DIR$/plugins/rspec-maven-plugin/rspec-maven-plugin.iml" filepath="$PROJECT_DIR$/plugins/rspec-maven-plugin/rspec-maven-plugin.iml" /> <module fileurl="file://$PROJECT_DIR$/examples/simple-example/simple-example.iml" filepath="$PROJECT_DIR$/examples/simple-example/simple-example.iml" /> </modules> </component> <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK" /> + <component name="ProjectRunConfigurationManager" /> + <component name="RAILS_PROJECT_VIEW_PANE" /> <component name="RUBY_DOC_SETTINGS"> <RUBY_DOC NAME="DEFAULTS" VALUE="TRUE" /> <RUBY_DOC NAME="NUMBER" VALUE="0" /> @@ -342,9 +335,11 @@ <option name="GENERATE_IIOP_STUBS" value="false" /> <option name="ADDITIONAL_OPTIONS_STRING" value="" /> </component> + <component name="StarteamVcsAdapter" /> <component name="VcsDirectoryMappings"> <mapping directory="" vcs="svn" /> </component> + <component name="VssVcs" /> <component name="com.intellij.jsf.UserDefinedFacesConfigs"> <option name="USER_DEFINED_CONFIGS"> <value> @@ -352,6 +347,12 @@ </value> </option> </component> + <component name="libraryTable" /> + <component name="uidesigner-configuration"> + <option name="INSTRUMENT_CLASSES" value="true" /> + <option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" /> + <option name="DEFAULT_LAYOUT_MANAGER" value="GridLayoutManager" /> + </component> <UsedPathMacros> <macro name="M2_REPOSITORY" /> </UsedPathMacros>
To unsubscribe from this list please visit:
