*UNDO* [373663] Always separate the Java Output Folder from the Java Source Folder

plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java

diff --git a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java
index c39f34e..daaf38f 100644
--- a/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java
+++ b/plugins/org.eclipse.jst.j2ee/j2eeplugin/org/eclipse/jst/j2ee/internal/plugin/JavaEEPreferencesInitializer.java
@@ -323,6 +323,8 @@
 	 * This will be made private once the deprecated J2EEPreferences class is deleted 
 	 */
 	static String getAppClientDefaultOutputFolderName(){
+		if (ProductManager.shouldUseSingleRootStructure())
+			return getDefaultString(Keys.APP_CLIENT_CONTENT_FOLDER);
 		return getDefaultOutputFolderName();
 	}
 	
@@ -331,6 +333,8 @@
 	 * This will be made private once the deprecated J2EEPreferences class is deleted 
 	 */
 	static String getEJBDefaultOutputFolderName(){
+		if (ProductManager.shouldUseSingleRootStructure())
+			return getDefaultString(Keys.EJB_CONTENT_FOLDER);
 		return getDefaultOutputFolderName();
 	}
 	
@@ -339,6 +343,8 @@
 	 * This will be made private once the deprecated J2EEPreferences class is deleted 
 	 */
 	static String getJCADefaultOutputFolderName(){
+		if (ProductManager.shouldUseSingleRootStructure())
+			return getDefaultString(Keys.JCA_CONTENT_FOLDER);
 		return getDefaultOutputFolderName();
 	}
 	
@@ -357,6 +363,8 @@
 	 * This will be made private once the deprecated J2EEPreferences class is deleted 
 	 */
 	static String getDefaultOutputFolderName(){
+		if (ProductManager.shouldUseSingleRootStructure())
+			return getDefaultJavaSrcFolder();
 	    String outputFolder = getProductProperty( "defaultJavaOutputFolder" ); //$NON-NLS-1$
 	    if( outputFolder == null ){
 	        outputFolder = getProductProperty( "outputFolder" ); //$NON-NLS-1$