Merged in brasseld/openesb-components (pull request #2)

ESBCOMP-18 Several Exceptions in WLM SE (java.lang.NoSuchMethodError)
master
David Brassely 2013-02-13 09:04:00 +01:00
commit 38e397a91c
4 changed files with 12 additions and 11 deletions

View File

@ -316,7 +316,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
<version>3.3.2.GA</version> <version>3.5.1-Final</version>
<optional>true</optional> <optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>
@ -332,7 +332,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-commons-annotations</artifactId> <artifactId>hibernate-commons-annotations</artifactId>
<version>3.1.0.GA</version> <version>3.2.0.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
@ -354,13 +354,13 @@
<dependency> <dependency>
<groupId>org.apache.solr</groupId> <groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId> <artifactId>solr-core</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.lucene</groupId> <groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId> <artifactId>lucene-core</artifactId>
<version>2.4.1</version> <version>2.9.1</version>
</dependency> </dependency>
<dependency> <dependency>

View File

@ -138,7 +138,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-core</artifactId> <artifactId>hibernate-core</artifactId>
<version>3.3.2.GA</version> <version>3.5.1-Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>net.sf.ehcache</groupId> <groupId>net.sf.ehcache</groupId>
@ -148,7 +148,7 @@
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
<artifactId>hibernate-commons-annotations</artifactId> <artifactId>hibernate-commons-annotations</artifactId>
<version>3.1.0.GA</version> <version>3.2.0.Final</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.hibernate</groupId> <groupId>org.hibernate</groupId>
@ -170,12 +170,12 @@
<dependency> <dependency>
<groupId>org.apache.solr</groupId> <groupId>org.apache.solr</groupId>
<artifactId>solr-core</artifactId> <artifactId>solr-core</artifactId>
<version>1.3.0</version> <version>1.4.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.lucene</groupId> <groupId>org.apache.lucene</groupId>
<artifactId>lucene-core</artifactId> <artifactId>lucene-core</artifactId>
<version>2.4.1</version> <version>2.9.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>

View File

@ -45,6 +45,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.lucene.analysis.Token; import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.TokenStream;
import org.apache.solr.analysis.TokenizerFactory; import org.apache.solr.analysis.TokenizerFactory;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.solr.common.SolrException; import org.apache.solr.common.SolrException;
/** /**
@ -99,7 +100,7 @@ public class PatternWhiteSpaceTokenizer implements TokenizerFactory{
/** /**
* Split the input using configured pattern * Split the input using configured pattern
*/ */
public TokenStream create(Reader input) { public Tokenizer create(Reader input) {
try { try {
// Read the input into a single string // Read the input into a single string
String str = IOUtils.toString( input ); String str = IOUtils.toString( input );
@ -110,7 +111,7 @@ public class PatternWhiteSpaceTokenizer implements TokenizerFactory{
: group( matcher, str, group ); : group( matcher, str, group );
final Iterator<Token> iter = tokens.iterator(); final Iterator<Token> iter = tokens.iterator();
return new TokenStream() { return new Tokenizer() {
@Override @Override
public Token next() throws IOException { public Token next() throws IOException {
if( iter.hasNext() ) { if( iter.hasNext() ) {

View File

@ -1615,7 +1615,7 @@ public class DBOperation {
.createCriteria("assignees", "a").add(userRestriction); .createCriteria("assignees", "a").add(userRestriction);
} }
// before1 = System.currentTimeMillis(); // before1 = System.currentTimeMillis();
Integer count = (Integer) criteriaA.uniqueResult(); Long count = (Long) criteriaA.uniqueResult();
// after1 = System.currentTimeMillis(); // after1 = System.currentTimeMillis();
int total = count == null ? 0 : count.intValue(); int total = count == null ? 0 : count.intValue();