Hi Vanji, I am reverting this commit as this leads to a compilation error. And I also noted you have committed to a released service stub in r186320.
On Tue, Sep 24, 2013 at 7:28 PM, <[email protected]> wrote: > Author: [email protected] > Date: Tue Sep 24 19:28:15 2013 > New Revision: 186321 > URL: http://wso2.org/svn/browse/wso2?view=rev&revision=186321 > > Log: > patch for ESBJAVA-2293 > > Modified: > > > carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/pom.xml > > > carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/src/main/java/org/wso2/carbon/sequences/ui/client/SequenceAdminClient.java > > > carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/src/main/resources/web/sequences/list_sequences.jsp > > Modified: > carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/pom.xml > URL: > http://wso2.org/svn/browse/wso2/carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/pom.xml?rev=186321&r1=186320&r2=186321&view=diff > > ============================================================================== > --- > carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/pom.xml > (original) > +++ > carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/pom.xml > Tue Sep 24 19:28:15 2013 > @@ -156,6 +156,7 @@ > <dependency> > <groupId>org.wso2.carbon</groupId> > <artifactId>org.wso2.carbon.sequences.stub</artifactId> > + <version>4.2.0</version> > </dependency> > </dependencies> > > > Modified: > carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/src/main/java/org/wso2/carbon/sequences/ui/client/SequenceAdminClient.java > URL: > http://wso2.org/svn/browse/wso2/carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/src/main/java/org/wso2/carbon/sequences/ui/client/SequenceAdminClient.java?rev=186321&r1=186320&r2=186321&view=diff > > ============================================================================== > --- > carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/src/main/java/org/wso2/carbon/sequences/ui/client/SequenceAdminClient.java > (original) > +++ > carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/src/main/java/org/wso2/carbon/sequences/ui/client/SequenceAdminClient.java > Tue Sep 24 19:28:15 2013 > @@ -104,15 +104,17 @@ > return false; > } > > - public SequenceInfo[] getSequencesSearch(int pageNumber, int > sequencePerPage, String searchText) > + public SequenceInfo[] getSequencesSearch(String searchText) > throws SequenceEditorException { > - List<SequenceInfo> sequences = new ArrayList<SequenceInfo>(); > + List<SequenceInfo> sequences = null; > + > try { > - org.wso2.carbon.sequences.stub.types.common.to.SequenceInfo[] > temp = > - sequenceAdminStub.getSequences(pageNumber, > sequenceAdminStub.getSequencesCount()); > + org.wso2.carbon.sequences.stub.types.common.to.SequenceInfo[] > temp = sequenceAdminStub.getSequencesSearch(searchText); > + > if (temp == null || temp.length == 0 || temp[0] == null) { > return null; > } > + sequences = new ArrayList<SequenceInfo>(); > > for > (org.wso2.carbon.sequences.stub.types.common.to.SequenceInfo info : temp) { > SequenceInfo seqInfo = new SequenceInfo(); > @@ -120,14 +122,11 @@ > seqInfo.setEnableTracing(info.getEnableTracing()); > seqInfo.setName(info.getName()); > seqInfo.setDescription(info.getDescription()); > - if (this.isServiceSatisfySearchString(searchText, > seqInfo.getName())) { > - sequences.add(seqInfo); > - } > + sequences.add(seqInfo); > } > } catch (Exception e) { > handleException("Couldn't retrieve the information of the > sequences", e); > } > - > if (sequences.size() > 0) { > return sequences.toArray(new SequenceInfo[sequences.size()]); > } > > Modified: > carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/src/main/resources/web/sequences/list_sequences.jsp > URL: > http://wso2.org/svn/browse/wso2/carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/src/main/resources/web/sequences/list_sequences.jsp?rev=186321&r1=186320&r2=186321&view=diff > > ============================================================================== > --- > carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/src/main/resources/web/sequences/list_sequences.jsp > (original) > +++ > carbon/platform/branches/4.2.0/components/sequence-editor/org.wso2.carbon.sequences.ui/4.2.0/src/main/resources/web/sequences/list_sequences.jsp > Tue Sep 24 19:28:15 2013 > @@ -99,34 +99,26 @@ > > else{ > > - sequences = > sequenceAdminClient.getSequencesSearch(pageNumber, > SequenceEditorConstants.SEQUENCE_PER_PAGE, sequenceSearchString); > + sequences = > sequenceAdminClient.getSequencesSearch(sequenceSearchString); > if (sequences == null) { > seqCount = sequenceAdminClient.getSequencesCount(); > } else { > seqCount = sequences.length; > } > - dynamicSequences = > sequenceAdminClient.getDynamicSequencesSearch(dynamicPageNumber, > SequenceEditorConstants.SEQUENCE_PER_PAGE, sequenceSearchString); > - if (dynamicSequences == null) { > - dynamicSequenceCount = > sequenceAdminClient.getDynamicSequenceCount(); > - > - } else { > - dynamicSequenceCount = dynamicSequences.length; > - } > + dynamicSequences = > sequenceAdminClient.getDynamicSequences(dynamicPageNumber, > + SequenceEditorConstants.SEQUENCE_PER_PAGE); > + dynamicSequenceCount = > sequenceAdminClient.getDynamicSequenceCount(); > > - if (sequences == null && dynamicSequences == null) { > + if (sequences == null) { > isSuccessfulSearch = false; > } > } > > if (!isSuccessfulSearch) { > sequences = sequenceAdminClient.getSequences(pageNumber, > SequenceEditorConstants.SEQUENCE_PER_PAGE); > - dynamicSequences = > sequenceAdminClient.getDynamicSequences(dynamicPageNumber, > - SequenceEditorConstants.SEQUENCE_PER_PAGE); > seqCount = sequenceAdminClient.getSequencesCount(); > - dynamicSequenceCount = > sequenceAdminClient.getDynamicSequenceCount(); > } > > - > if (seqCount % SequenceEditorConstants.SEQUENCE_PER_PAGE == 0) { > numberOfPages = seqCount / > SequenceEditorConstants.SEQUENCE_PER_PAGE; > } else { > _______________________________________________ > Commits mailing list > [email protected] > http://wso2.org/cgi-bin/mailman/listinfo/commits > -- *Isuru Udana* * * Senior * Software Engineer * WSO2 Inc.; http://wso2.com email: [email protected] cell: +94 77 3791887 blog: http://mytecheye.blogspot.com/ twitter: http://twitter.com/isudana
_______________________________________________ Dev mailing list [email protected] http://wso2.org/cgi-bin/mailman/listinfo/dev
