diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/ComponentTeamScanner.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/ComponentTeamScanner.java
index 0414c249b5acf94939d448c611230ce2bd94e678..e3b1731ae822f3dc72b464261dd45123baaa1920 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/ComponentTeamScanner.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/ComponentTeamScanner.java
@@ -146,9 +146,18 @@ public abstract class ComponentTeamScanner implements IComponentConstants {
 		// Create the JEM team with associated plugins
 		ComponentTeam jem = new ComponentTeam(COMPONENT_TEAM_JEM);
 		getPluginComponentMap().put(PLUGIN_EXPRESSION_JEM,jem);
-		getPluginComponentMap().put(PLUGIN_EXPRESSION_JEM_,jem);
 		componentTeams.add(jem);
 		
+		// Create the JSF team with associated plugins
+		ComponentTeam jsf = new ComponentTeam(COMPONENT_TEAM_JSF);
+		getPluginComponentMap().put(PLUGIN_EXPRESSION_JSF,jsf);
+		componentTeams.add(jsf);
+		
+		// Create the JPA team with associated plugins
+		ComponentTeam jpa = new ComponentTeam(COMPONENT_TEAM_JPA);
+		getPluginComponentMap().put(PLUGIN_EXPRESSION_JPA,jpa);
+		componentTeams.add(jpa);
+		
 		// Add a "team" for the unknown references
 		ComponentTeam unknown = new ComponentTeam(COMPONENT_TEAM_UNKNOWN);
 		componentTeams.add(unknown);
diff --git a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/IComponentConstants.java b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/IComponentConstants.java
index b269d38fbf3260b5e8e8c3978fbc09f157d5521f..cb1e25aa0fc7784fd8515d0e6a8786ee0078c410 100644
--- a/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/IComponentConstants.java
+++ b/archive/releng.builder/tools/apitools/org.eclipse.wtp.releng.tools.component.core/src/org/eclipse/wtp/releng/tools/component/adopters/IComponentConstants.java
@@ -22,6 +22,8 @@ public interface IComponentConstants {
 	public static final String COMPONENT_TEAM_WEB_SERVICES = "Web Services"; //$NON-NLS-1$
 	public static final String COMPONENT_TEAM_SERVER = "Server"; //$NON-NLS-1$
 	public static final String COMPONENT_TEAM_JEM = "Jem"; //$NON-NLS-1$
+	public static final String COMPONENT_TEAM_JSF = "JSF"; //$NON-NLS-1$
+	public static final String COMPONENT_TEAM_JPA = "JPA"; //$NON-NLS-1$
 	public static final String COMPONENT_TEAM_UNKNOWN = "Unknown"; //$NON-NLS-1$
 	
 	// General Expressions for plugin name matching
@@ -52,6 +54,9 @@ public interface IComponentConstants {
 	public static final String PLUGIN_EXPRESSION_INTERNET = "org.eclipse..st.internet.*"; //$NON-NLS-1$
 	
 	public static final String PLUGIN_EXPRESSION_JEM = "org.eclipse.jem.*"; //$NON-NLS-1$
-	public static final String PLUGIN_EXPRESSION_JEM_ = "org.eclipse.jem"; //$NON-NLS-1$
+	
+	public static final String PLUGIN_EXPRESSION_JSF = "org.eclipse.jst.jsf.*"; //$NON-NLS-1$
+	
+	public static final String PLUGIN_EXPRESSION_JPA = "org.eclipse.jpa.*"; //$NON-NLS-1$
 	
 }