Preheat oven to 350 degrees F. Place all ingredients, except the artichokes, in a medium saucepan and bring to a simmer. Place the artichoke hearts a small baking dish and pour the mixture over them. Cover and bake in the oven for 30 to 40 minutes, or until tender. Serve with lots of bread to sop up juice.
Black Olive Vinaigrette:
Combine all ingredients in a blender and blend until smooth. Season with salt and pepper to taste.
Place salmon in a small baking dish and pour 1/2 cup of the vinaigrette over. Marinate for 15 minutes. Preheat grill or grill pan over high heat. Remove salmon from marinade and season with salt and pepper to taste and grill for 3 to 4 minutes on each side, brush with the reserved vinaigrette every 2 minutes.