• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
regenerate gwt
  1. … 717 more files in changeset.
remove gwt gen stuff
  1. … 718 more files in changeset.
Regenerate the gwt things
  1. … 717 more files in changeset.
Regenerate the gwt things
  1. … 717 more files in changeset.
regenerate gwt
  1. … 718 more files in changeset.
removed gwt gen dir
  1. … 718 more files in changeset.
https://jira.jboss.org/jira/browse/BRMS-268: Mortgages example rules broken
    • -54
    • +66
    ./src/main/resources/mortgage-sample-repository.xml
BRMS-267 again ;-)
  1. … 48 more files in changeset.
BRMS-267 Change version from 5.0.1 to 5.0.2
regenerate gwt
  1. … 718 more files in changeset.
remove gwt generated dir
  1. … 717 more files in changeset.
regenerate gwt stuff
  1. … 721 more files in changeset.
rm gwt dirs
  1. … 717 more files in changeset.
Update gwt generated files via gwt 1.5.2
  1. … 717 more files in changeset.
Update gwt generate files
  1. … 727 more files in changeset.
Fixed a GWT compile problem.
Merged BRMS-97(Category table includes 2 "undefined" columns - displays category UUID and name),guvnor-279(Archived assets table includes "undefined" column - displays asset UUID)

Merge log:

1. Updated AssetItemGrid.java with necessary changes.

2. Updated archivedrulelist.properties with r31180

Merged BRMS-121(enums partially broken when using external functions) from trunk.

Merge log:

1.replaced SuggestionCompletionEngine with 29015 version.

replaced SuggestionCompletionEngineTest with 27831 version.

This is because SuggestionCompletionEngine has a previous version 27831:

/labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngine.java

/labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/guvnor/client/modeldriven/SuggestionCompletionEngineTest.java

2. replaced ConstraintValueEditor with 29015 version.

replaced LiteralEditor with 29008 version

NOTE: ConstraintValueEditor has a previous version 29008:

/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java

/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/LiteralEditor.java

3. as /labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/ServiceImplementation.java has too many previous versions, I only changed ServiceImplementation with the code change made to version 27008:

line 2214, added:

if ( valuePairs[i] == null ) {

return new String[0];

}

4. changed ServiceImplementationTest with the code change made to version 27008:

line 2467, added

public void testLoadDropDownNoValuePairs() throws Exception {

ServiceImplementation serv = new ServiceImplementation();

String[] pairs = new String[]{null};

String expression = "['@{f1}', '@{f2}']";

String[] r = serv.loadDropDownExpression(pairs, expression);

assertEquals(0, r.length);

}

  1. … 2 more files in changeset.
update gwt generated files
  1. … 727 more files in changeset.
update gwt generated files
  1. … 717 more files in changeset.
Merged BRMS-131(broken reloading of values in drop down lists when working with enums) from trunk.

Merge log:

1. For Constants.java and Constants.properties, we only added constants needed by this version.

2. /labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java

replaced its content with r28994.

3. /labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DatePicker.java

replaced its content with 28994 version.

4. /labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DatePickerLabel.java

replaced its content with 28994 version.

5. /labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/LiteralEditor.java

replace its content with 28994 version.

6. /labs/jbossrules/trunk/drools-guvnor/src/test/java/org/drools/guvnor/server/security/SecurityServiceImplTest.java

did not do anything with this file

NOTE: wont compile after this merge. This is mainly because we missed r26981 which is part of fix for BRMS-125. Then did following:

replaced DatePickerTextBox.java with r27109

replaced DatePickerPopUp.java with r26981

replaced DSLSentenceWidget.java with r27110

replaced QueryWidget.java with r26981

replaced /labs/jbossrules/trunk/drools-eclipse/org.drools.eclipse/src/main/java/org/drools/eclipse/rulebuilder/ui/DSLSentenceWidget.java with r27001

For this merge, we also included fixes for following jiras:

r27109: GUVNOR-375 : DSL broken -Dates fixed

r27110: GUVNOR-375 : DSL broken -Broken regexp fixed

r27001: GUVNOR-374 : When using DSL for booleans the dropdown is always saved as true

GUVNOR-373 : Defining a checkbox via DSL doesn't work anymore - generated rule is broken - Fixed in Guvnor and Eclipse

r27000: GUVNOR-373 : Defining a checkbox via DSL doesn't work anymore - generated rule is broken

r26981: GUVNOR-173 : Replace the Date Picker widget in DSLSentenceWidget with a custom widget

  1. … 1 more file in changeset.
BRMS-228, Merge fix from trunk, Merge actions:1) svn merge -r 26591:29536 https://svn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/server/contenthandler/ModelContentHandler.java 2) Merge FileManageUtilsTest.java partially because it involves other jira.
Merged BRMS-141(When there are 2 bound variables in a guided rule, and you map a third fact with one of the attribute, then there a blank screen and the guided rule never shows again) from trunk. This jira involves 5 commits: 31096, 31038, 28764, 27833, 26938

Merge log:

1. svn merge -r 26591:31096 https://svn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/guvnor/client/modeldriven/brl/RuleModel.java

2. svn merge -r 26591:28764 https://svn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-compiler/test/java/org/drools/guvnor/modeldriven/RuleModelTest.java

3. svn merge -r 26591:28764 https://svn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ActionValueEditor.java

4. svn merge -r 26591:28764 https://svn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java

NOTE: This merge failed due to conflication. Then replaced content of ConstraintValueEditor.java with content from 28764

5. svn add ProcessServerPanel.java. Its content is copied from 26938. Note, revision 26938 of ProcessServerPanel.java has previous revision r26859:

/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ExplorerLayoutManager.java

/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/explorer/ProcessServerPanel.java

did nothing to ExplorerLayoutManager.java.

6. svn add SampleSaveEventMock.java, its content is copied from version 26938.

  1. … 2 more files in changeset.
Merged BRMS-143(can't remove a global from test scenario) from trunk.

Merge log:

svn merge -r 26591:27497 https://svn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/qa/ScenarioWidget.java

Note, to merge 27497 we have to include revision 26945 and 26759 of ScenarioWidget.java and revision 26759 of FormStylePopup.java. 26759 has already been on this branch. So this merge includes 26945: GUVNOR-364 : In an expect part of a test scenario, if you use a class and then remove the model, il it not possible to open that testscenario

Merged BRMS-125(dates not properly displayed) from trunk.

Merge log:

1. svn merge -r 26591:26858 https://svn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/ConstraintValueEditor.java

2. svn merge -r 26591:26858 https://svn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/modeldriven/ui/DSLSentenceWidget.java

3. svn cp DatePicker.java DatePickerLabel.java(DatePickerLabel.java was copied from DatePicker.java at r26830), then

replaced DatePickerLabel.java's content with the content of DatePickerLabel r26858.

4. get DatePickerPopUp.java's content from r26858, svn add DatePickerPopUp.java

5. get DatePickerTextBox.java's content from r26858, svn add DatePickerTextBox.java

6. get GuvnorDatePicker.java's content from r26858, svn add GuvnorDatePicker.java

7. svn merge -r 26591:26858 https://svn.jboss.org/repos/labs/labs/jbossrules/trunk/drools-guvnor/src/main/java/org/drools/guvnor/client/rulelist/QueryWidget.java

8. wont compile after this merge. then did following:

replace DatePicker.java's content with r26861's content.