[jboss-svn-commits] JBL Code SVN: r35344 - labs/jbossrules/soa_branches/BRMS-5.1.1/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences.

[jboss-svn-commits at lists.jboss.org]

Author: dennyxu
Date: 2010-09-29 04:30:53 -0400 (Wed, 29 Sep 2010)
New Revision: 35344

Modified:
   labs/jbossrules/soa_branches/BRMS-5.1.1/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/GuvnorPreferencePage.java
   labs/jbossrules/soa_branches/BRMS-5.1.1/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/IGuvnorPreferenceConstants.java
Log:
Merge the fix for BRMS-39 into BRMS 5.1.1 branch

Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/GuvnorPreferencePage.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/GuvnorPreferencePage.java	2010-09-29 08:27:33 UTC (rev 35343)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/GuvnorPreferencePage.java	2010-09-29 08:30:53 UTC (rev 35344)
@@ -195,7 +195,7 @@
 		IPreferenceStore store = Activator.getDefault().getPreferenceStore();
 		String res = null;
 		if (!store.contains(IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_PREF)) {
-			res = IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_DEFAULT;
+			res = IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_DEFAULT_ORG;
 			store.putValue(IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_PREF, res);
 		} else {
 			res = store.getString(IGuvnorPreferenceConstants.GUVNOR_LOC_TEMPLATE_PREF);

Modified: labs/jbossrules/soa_branches/BRMS-5.1.1/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/IGuvnorPreferenceConstants.java
===================================================================
--- labs/jbossrules/soa_branches/BRMS-5.1.1/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/IGuvnorPreferenceConstants.java	2010-09-29 08:27:33 UTC (rev 35343)
+++ labs/jbossrules/soa_branches/BRMS-5.1.1/drools-eclipse/org.guvnor.tools/src/org/guvnor/tools/preferences/IGuvnorPreferenceConstants.java	2010-09-29 08:30:53 UTC (rev 35344)
@@ -28,6 +28,7 @@
 	public String GUVNOR_LOC_TEMPLATE_PREF = "guvnor_loc_template"; //$NON-NLS-1$
 	
 	public String GUVNOR_LOC_TEMPLATE_DEFAULT = "http://localhost:8080/jboss-brms/org.drools.guvnor.Guvnor/webdav/"; //$NON-NLS-1$
+	public String GUVNOR_LOC_TEMPLATE_DEFAULT_ORG = "http://localhost:8080/drools-guvnor/org.drools.guvnor.Guvnor/webdav/"; //$NON-NLS-1$
 	
 	public String SAVE_PASSWORDS_PREF = "save_passwords"; //$NON-NLS-1$