Taxonomy and Post_Type Permalinks

I am at my wit’s end trying to get this to work:
Custom Post Type: Portfolio (rewrite=>’portfolio’)
Custom Taxonomy: Portfolio-category (hierarchical, “landscape, portrait, etc.”

Desired Permalinks:
test.com/portfolio => (archive.php || index.php)shows all post_types of portfolio
test.com/portfolio/landscape => (taxonomy.php || index.php)shows all “landscape” portfolio
test.com/portfolio/post-name => (single.php) (Only thing that works right now)

Can someone tell me if this is possible, and point me to some clear code that works.
I have already tried adding rewrite=>’portfolio’ to the custom taxonomy, but that doesn’t work, and refreshing the permalinks page does nothing.
I truly think that this isn’t possible at the moment, and am doubting that it will be fixed for 3.1 either.