Attachment #95703 for bug #182357

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 182357
Collapse All | Expand All

Lines 184-189 Link Here

(-)a/ruby.railsprojects/nbproject/project.xml (+8 lines)
184	</run-dependency>	184	</run-dependency>
185	</dependency>	185	</dependency>
186	<dependency>	186	<dependency>
		187	<code-name-base>org.netbeans.modules.web.common</code-name-base>
		188	<build-prerequisite/>
		189	<compile-dependency/>
		190	<run-dependency>
		191	<specification-version>1.1</specification-version>
		192	</run-dependency>
		193	</dependency>
		194	<dependency>
187	<code-name-base>org.netbeans.modules.server</code-name-base>	195	<code-name-base>org.netbeans.modules.server</code-name-base>
188	<build-prerequisite/>	196	<build-prerequisite/>
189	<compile-dependency/>	197	<compile-dependency/>




import org.netbeans.modules.ruby.rubyproject.UpdateHelper;
import org.netbeans.modules.ruby.rubyproject.spi.PropertiesProvider;
import org.netbeans.modules.ruby.spi.project.support.rake.RakeProjectHelper;
import org.netbeans.modules.web.common.spi.ProjectWebRootProvider;
import org.netbeans.spi.project.AuxiliaryConfiguration;
import org.netbeans.spi.project.AuxiliaryProperties;
import org.netbeans.spi.project.SubprojectProvider;

                public SharedRubyProjectProperties getProperties() {
                    return new RailsProjectProperties(RailsProject.this, updateHelper, evaluator(), refHelper, genFilesHelper);
                }
            },
            new ProjectWebRootProviderImpl()
        });
        return LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-ruby-railsprojects/Lookup"); //NOI18N
    }

        }
        
    }

    private final class ProjectWebRootProviderImpl implements ProjectWebRootProvider {

        @Override
        public FileObject getWebRoot(FileObject file) {
            return getProjectDirectory().getFileObject("public"); // NOI18N
        }
    }
}

Lines 131-136 Link Here

(-)a/web.common/nbproject/project.xml (+1 lines)
131	<friend>org.netbeans.modules.css.editor</friend>	131	<friend>org.netbeans.modules.css.editor</friend>
132	<friend>org.netbeans.modules.html.editor</friend>	132	<friend>org.netbeans.modules.html.editor</friend>
133	<friend>org.netbeans.modules.php.project</friend>	133	<friend>org.netbeans.modules.php.project</friend>
		134	<friend>org.netbeans.modules.ruby.railsprojects</friend>
134	<friend>org.netbeans.modules.web.jsf.editor</friend>	135	<friend>org.netbeans.modules.web.jsf.editor</friend>
135	<friend>org.netbeans.modules.web.project</friend>	136	<friend>org.netbeans.modules.web.project</friend>
136	<package>org.netbeans.modules.web.common.api</package>	137	<package>org.netbeans.modules.web.common.api</package>

Return to bug 182357

Lines 64-69 Link Here

(-)a/ruby.railsprojects/src/org/netbeans/modules/ruby/railsprojects/RailsProject.java (-2 / +11 lines)
64	import org.netbeans.modules.ruby.rubyproject.UpdateHelper;	64	import org.netbeans.modules.ruby.rubyproject.UpdateHelper;
65	import org.netbeans.modules.ruby.rubyproject.spi.PropertiesProvider;	65	import org.netbeans.modules.ruby.rubyproject.spi.PropertiesProvider;
66	import org.netbeans.modules.ruby.spi.project.support.rake.RakeProjectHelper;	66	import org.netbeans.modules.ruby.spi.project.support.rake.RakeProjectHelper;
		67	import org.netbeans.modules.web.common.spi.ProjectWebRootProvider;
67	import org.netbeans.spi.project.AuxiliaryConfiguration;	68	import org.netbeans.spi.project.AuxiliaryConfiguration;
68	import org.netbeans.spi.project.AuxiliaryProperties;	69	import org.netbeans.spi.project.AuxiliaryProperties;
69	import org.netbeans.spi.project.SubprojectProvider;	70	import org.netbeans.spi.project.SubprojectProvider;
Lines 145-152 Link Here
145	public SharedRubyProjectProperties getProperties() {	146	public SharedRubyProjectProperties getProperties() {
146	return new RailsProjectProperties(RailsProject.this, updateHelper, evaluator(), refHelper, genFilesHelper);	147	return new RailsProjectProperties(RailsProject.this, updateHelper, evaluator(), refHelper, genFilesHelper);
147	}	148	}
148	}	149	},
149		150	new ProjectWebRootProviderImpl()
150	});	151	});
151	return LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-ruby-railsprojects/Lookup"); //NOI18N	152	return LookupProviderSupport.createCompositeLookup(base, "Projects/org-netbeans-modules-ruby-railsprojects/Lookup"); //NOI18N
152	}	153	}
Lines 253-256 Link Here
253	}	254	}
254		255
255	}	256	}
		257
		258	private final class ProjectWebRootProviderImpl implements ProjectWebRootProvider {
		259
		260	@Override
		261	public FileObject getWebRoot(FileObject file) {
		262	return getProjectDirectory().getFileObject("public"); // NOI18N
		263	}
		264	}
256	}	265	}