[hornetq-commits] JBoss hornetq SVN: r10507 - in trunk: distribution/src/main/assembly and 23 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Apr 14 07:16:55 EDT 2011
Author: ataylor
Date: 2011-04-14 07:16:55 -0400 (Thu, 14 Apr 2011)
New Revision: 10507
Added:
trunk/examples/build.xml
trunk/examples/common/
trunk/examples/core/
trunk/examples/javaee/
trunk/examples/jms/
trunk/examples/soak/
trunk/examples/src/main/assembly/
trunk/examples/src/main/assembly/dep.xml
Removed:
trunk/examples/src/main/resources/build.xml
trunk/examples/src/main/resources/common/
trunk/examples/src/main/resources/core/
trunk/examples/src/main/resources/javaee/
trunk/examples/src/main/resources/jms/
trunk/examples/src/main/resources/soak/
trunk/hornetq-core/src/main/java/org/hornetq/core/filter/impl/FilterParser.jj
Modified:
trunk/distribution/hornetq-distribution.iml
trunk/distribution/src/main/assembly/dep.xml
trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java
trunk/examples/javaee/jca-remote/src/org/hornetq/javaee/example/MDBRemoteServerClientExample.java
trunk/examples/jms/clustered-static-oneway/src/org/hornetq/jms/example/ClusterStaticOnewayExample.java
trunk/examples/jms/multiple-failover-failback/src/org/hornetq/jms/example/MultipleFailoverFailbackExample.java
trunk/examples/jms/stop-server-failover/src/org/hornetq/jms/example/StopServerFailoverExample.java
trunk/examples/pom.xml
trunk/hornetq-core-client/hornetq-core-client.iml
trunk/hornetq-jms-client/hornetq-jms-client.iml
trunk/hornetq-ra/hornetq-rar-pom.iml
trunk/tests/concurrent-tests/concurrent-tests.iml
trunk/tests/hornetq-tests-pom.iml
trunk/tests/integration-tests/integration-tests.iml
trunk/tests/jms-tests/jms-tests.iml
trunk/tests/joram-tests/joram-tests.iml
trunk/tests/performance-tests/performance-tests.iml
trunk/tests/soak-tests/soak-tests.iml
trunk/tests/stress-tests/stress-tests.iml
trunk/tests/timing-tests/timing-tests.iml
trunk/tests/unit-tests/unit-tests.iml
Log:
moved examples back
Modified: trunk/distribution/hornetq-distribution.iml
===================================================================
--- trunk/distribution/hornetq-distribution.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/distribution/hornetq-distribution.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
- <exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
<excludeFolder url="file://$MODULE_DIR$/target" />
Modified: trunk/distribution/src/main/assembly/dep.xml
===================================================================
--- trunk/distribution/src/main/assembly/dep.xml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/distribution/src/main/assembly/dep.xml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -2,14 +2,14 @@
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
<id>bin</id>
- <formats>
+ <formats><!--
<format>tar.gz</format>
- <format>zip</format>
+ <format>zip</format>-->
<format>dir</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
<moduleSets>
- <moduleSet>
+ <!-- <moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
<include>org.hornetq:hornetq-bootstrap</include>
@@ -126,7 +126,7 @@
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
</binaries>
- </moduleSet>
+ </moduleSet>-->
<!--
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
@@ -138,7 +138,7 @@
<unpack>false</unpack>
</binaries>
</moduleSet>-->
- <moduleSet>
+ <!-- <moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
<include>org.hornetq:hornetq-service-sar</include>
@@ -170,19 +170,24 @@
<outputDirectory>lib</outputDirectory>
<unpack>false</unpack>
</binaries>
- </moduleSet>
+ </moduleSet>-->
<moduleSet>
<useAllReactorProjects>true</useAllReactorProjects>
<includes>
<include>org.hornetq:hornetq-examples</include>
</includes>
- <binaries>
+ <sources>
+ <outputDirectory>examples</outputDirectory>
+ </sources>
+ <!-- <binaries>
<includeDependencies>false</includeDependencies>
<outputDirectory>examples</outputDirectory>
- </binaries>
+ <unpack>true</unpack>
+ <attachmentClassifier>sources</attachmentClassifier>
+ </binaries>-->
</moduleSet>
</moduleSets>
- <fileSets>
+ <!-- <fileSets>
<fileSet>
<directory>src/main/resources/config</directory>
<outputDirectory>config</outputDirectory>
@@ -199,5 +204,5 @@
<directory>src/main/resources/licenses</directory>
<outputDirectory>licenses</outputDirectory>
</fileSet>
- </fileSets>
+ </fileSets>-->
</assembly>
Copied: trunk/examples/build.xml (from rev 10506, trunk/examples/src/main/resources/build.xml)
===================================================================
--- trunk/examples/build.xml (rev 0)
+++ trunk/examples/build.xml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE project [
+ <!ENTITY libraries SYSTEM "../../../thirdparty/libraries.ent">
+ ]>
+
+<!-- =========================================================================================== -->
+<!-- -->
+<!-- JBoss, Home of Professional Open Source -->
+<!-- Copyright 2005, JBoss Inc., and individual contributors as indicated -->
+<!-- by the @authors tag. See the copyright.txt in the distribution for a -->
+<!-- full listing of individual contributors. -->
+<!-- -->
+<!-- This is free software; you can redistribute it and/or modify it -->
+<!-- under the terms of the GNU Lesser General Public License as -->
+<!-- published by the Free Software Foundation; either version 2.1 of -->
+<!-- the License, or (at your option) any later version. -->
+<!-- -->
+<!-- This software is distributed in the hope that it will be useful, -->
+<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
+<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
+<!-- Lesser General Public License for more details. -->
+<!-- -->
+<!-- You should have received a copy of the GNU Lesser General Public -->
+<!-- License along with this software; if not, write to the Free -->
+<!-- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -->
+<!-- 02110-1301 USA, or see the FSF site: http://www.fsf.org. -->
+<!-- -->
+<!-- =========================================================================================== -->
+
+
+<project default="clean" name="examples" basedir="../../..//">
+ <target name="clean">
+ <subant target="clean" failonerror="true">
+ <fileset dir="../../..//" excludes="build.xml" includes="**/build.xml" />
+ </subant>
+ </target>
+</project>
Modified: trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java
===================================================================
--- trunk/examples/src/main/resources/core/perf/src/org/hornetq/core/example/PerfBase.java 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2011-04-14 11:16:55 UTC (rev 10507)
@@ -24,7 +24,6 @@
import org.hornetq.api.core.Message;
import org.hornetq.api.core.TransportConfiguration;
-import org.hornetq.api.core.client.*;
import org.hornetq.core.remoting.impl.netty.NettyConnectorFactory;
import org.hornetq.core.remoting.impl.netty.TransportConstants;
import org.hornetq.utils.TokenBucketLimiter;
Modified: trunk/examples/javaee/jca-remote/src/org/hornetq/javaee/example/MDBRemoteServerClientExample.java
===================================================================
--- trunk/examples/src/main/resources/javaee/jca-remote/src/org/hornetq/javaee/example/MDBRemoteServerClientExample.java 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/examples/javaee/jca-remote/src/org/hornetq/javaee/example/MDBRemoteServerClientExample.java 2011-04-14 11:16:55 UTC (rev 10507)
@@ -16,7 +16,6 @@
import org.hornetq.common.example.HornetQExample;
-import javax.jms.*;
import javax.naming.InitialContext;
/**
Modified: trunk/examples/jms/clustered-static-oneway/src/org/hornetq/jms/example/ClusterStaticOnewayExample.java
===================================================================
--- trunk/examples/src/main/resources/jms/clustered-static-oneway/src/org/hornetq/jms/example/ClusterStaticOnewayExample.java 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/examples/jms/clustered-static-oneway/src/org/hornetq/jms/example/ClusterStaticOnewayExample.java 2011-04-14 11:16:55 UTC (rev 10507)
@@ -14,7 +14,6 @@
import org.hornetq.common.example.HornetQExample;
-import javax.jms.*;
import javax.naming.InitialContext;
import java.lang.Exception;
Modified: trunk/examples/jms/multiple-failover-failback/src/org/hornetq/jms/example/MultipleFailoverFailbackExample.java
===================================================================
--- trunk/examples/src/main/resources/jms/multiple-failover-failback/src/org/hornetq/jms/example/MultipleFailoverFailbackExample.java 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/examples/jms/multiple-failover-failback/src/org/hornetq/jms/example/MultipleFailoverFailbackExample.java 2011-04-14 11:16:55 UTC (rev 10507)
@@ -18,7 +18,6 @@
import org.hornetq.core.client.impl.DelegatingSession;
import org.hornetq.jms.client.HornetQConnection;
-import javax.jms.*;
import javax.naming.InitialContext;
/**
Modified: trunk/examples/jms/stop-server-failover/src/org/hornetq/jms/example/StopServerFailoverExample.java
===================================================================
--- trunk/examples/src/main/resources/jms/stop-server-failover/src/org/hornetq/jms/example/StopServerFailoverExample.java 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/examples/jms/stop-server-failover/src/org/hornetq/jms/example/StopServerFailoverExample.java 2011-04-14 11:16:55 UTC (rev 10507)
@@ -14,7 +14,6 @@
import org.hornetq.common.example.HornetQExample;
-import javax.jms.*;
import javax.naming.InitialContext;
/**
Modified: trunk/examples/pom.xml
===================================================================
--- trunk/examples/pom.xml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/examples/pom.xml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -22,9 +22,19 @@
</resources>
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
+ <artifactId>maven-assembly-plugin</artifactId>
<version>2.2</version>
+ <configuration>
+ <descriptor>src/main/assembly/dep.xml</descriptor>
+ </configuration>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Copied: trunk/examples/src/main/assembly/dep.xml (from rev 10496, trunk/distribution/src/main/assembly/dep.xml)
===================================================================
--- trunk/examples/src/main/assembly/dep.xml (rev 0)
+++ trunk/examples/src/main/assembly/dep.xml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -0,0 +1,36 @@
+<!--
+ ~ Copyright 2009 Red Hat, Inc.
+ ~ Red Hat licenses this file to you under the Apache License, version
+ ~ 2.0 (the "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ ~ implied. See the License for the specific language governing
+ ~ permissions and limitations under the License.
+ -->
+
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
+ <id>src</id>
+ <formats>
+ <format>zip</format>
+ </formats>
+ <fileSets>
+ <fileSet>
+ <!-- TODO: use expresssions instead: ${project.build.sourceDirectory}, etc -->
+ <directory>${project.basedir}</directory>
+ <includes>
+ <include>bin/*</include>
+ <include>common/*</include>
+ <include>core/*</include>
+ <include>javaee/*</include>
+ <include>jms/*</include>
+ <include>soak/*</include>
+ <include>build.xml</include>
+ </includes>
+ <useDefaultExcludes>true</useDefaultExcludes>
+ </fileSet>
+ </fileSets>
+</assembly>
Deleted: trunk/examples/src/main/resources/build.xml
===================================================================
--- trunk/examples/src/main/resources/build.xml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/examples/src/main/resources/build.xml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
- <!ENTITY libraries SYSTEM "../../../thirdparty/libraries.ent">
- ]>
-
-<!-- =========================================================================================== -->
-<!-- -->
-<!-- JBoss, Home of Professional Open Source -->
-<!-- Copyright 2005, JBoss Inc., and individual contributors as indicated -->
-<!-- by the @authors tag. See the copyright.txt in the distribution for a -->
-<!-- full listing of individual contributors. -->
-<!-- -->
-<!-- This is free software; you can redistribute it and/or modify it -->
-<!-- under the terms of the GNU Lesser General Public License as -->
-<!-- published by the Free Software Foundation; either version 2.1 of -->
-<!-- the License, or (at your option) any later version. -->
-<!-- -->
-<!-- This software is distributed in the hope that it will be useful, -->
-<!-- but WITHOUT ANY WARRANTY; without even the implied warranty of -->
-<!-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -->
-<!-- Lesser General Public License for more details. -->
-<!-- -->
-<!-- You should have received a copy of the GNU Lesser General Public -->
-<!-- License along with this software; if not, write to the Free -->
-<!-- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -->
-<!-- 02110-1301 USA, or see the FSF site: http://www.fsf.org. -->
-<!-- -->
-<!-- =========================================================================================== -->
-
-
-<project default="clean" name="examples" basedir="../../../">
- <target name="clean">
- <subant target="clean" failonerror="true">
- <fileset dir="../../../" excludes="build.xml" includes="**/build.xml" />
- </subant>
- </target>
-</project>
Deleted: trunk/hornetq-core/src/main/java/org/hornetq/core/filter/impl/FilterParser.jj
===================================================================
--- trunk/hornetq-core/src/main/java/org/hornetq/core/filter/impl/FilterParser.jj 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/hornetq-core/src/main/java/org/hornetq/core/filter/impl/FilterParser.jj 2011-04-14 11:16:55 UTC (rev 10507)
@@ -1,646 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005-2008, Red Hat Middleware LLC, and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-options {
- LOOKAHEAD=1;
- UNICODE_INPUT=true;
-/*
- DEBUG_PARSER=true;
- DEBUG_LOOKAHEAD=true;
- DEBUG_TOKEN_MANAGER=true;
-*/
-}
-
-PARSER_BEGIN(FilterParser)
-
-package org.hornetq.core.filter.impl;
-
-import java.io.StringReader;
-
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import org.hornetq.api.core.SimpleString;
-import org.hornetq.core.filter.impl.SimpleStringReader;
-
-/**
- * A JavaCC 2.0 grammar for HornetQ filters
- *
- * @author Scott.Stark at jboss.org
- * @author adrian at jboss.org
- * @version $Revision: 2681 $
- */
-public class FilterParser
-{
- private static final String LOFFER_L = "l";
- private static final String UPPER_L = "L";
- private static final String OX = "0X";
- private static final String Ox = "0x";
- private static final String ZERRO = "0";
-
- private Map identifierMap;
-
- public FilterParser()
- {
- // keep the parser from freaking out, init using one of
- // the JavaCC generated constructor
- this(new StringReader(""));
- }
-
- public Object parse(SimpleString selector, Map identifierMap)
- throws ParseException
- {
- return parse(selector, identifierMap, false);
- }
-
- public Object parse(SimpleString selector, Map identifierMap, boolean trace)
- throws ParseException
- {
- SimpleStringReader sr = new SimpleStringReader(selector);
- ReInit(sr);
-
- // This will have no effect unless the debugging options are true
- if (trace)
- {
- this.enable_tracing();
- }
- else
- {
- this.disable_tracing();
- }
-
- this.identifierMap = identifierMap;
- return this.expression();
- }
-
- /**
- * Strip off the leading and trailing (quote) chars from the given string
- * and return it.
- */
- private SimpleString stripQuotes(String image)
- {
- StringBuffer result = new StringBuffer(image.length()-2);
- int i = 1;
- boolean escaped = false;
- while (i < image.length() - 1)
- {
- if (escaped)
- {
- if (image.charAt(i) == '\'')
- result.append('\'');
- else
- throw new RuntimeException("Invalid uses of quotes: " + image);
- escaped = false;
- }
- else if (image.charAt(i) == '\'')
- escaped = true;
- else
- result.append(image.charAt(i));
- ++i;
- }
- return new SimpleString(result.toString());
- }
-
- public static Object doParse(SimpleString selector, Map identifierMap)
- throws ParseException
- {
- return doParse(selector, identifierMap, false);
- }
-
- public static Object doParse(SimpleString selector, Map identifierMap, boolean trace)
- throws ParseException
- {
- FilterParser parser = new FilterParser();
- return parser.parse(selector, identifierMap, trace);
- }
-}
-
-PARSER_END(FilterParser)
-
-/* IGNORE WHITESPACE */
-
-SKIP :
-{
- " "
- | "\r"
- | "\t"
- | "\f"
- | "\n"
-}
-
-
-/* RESERVED WORDS AND LITERALS */
-
-TOKEN [IGNORE_CASE]:
-{
- < TRUE: "TRUE" >
- | < FALSE: "FALSE" >
- | < NULL: "NULL" >
- | < AND: "AND" >
- | < NOT: "NOT" >
- | < OR: "OR" >
- | < BETWEEN: "BETWEEN" >
- | < LIKE: "LIKE" >
- | < IN: "IN" >
- | < IS: "IS" >
- | < ESCAPE: "ESCAPE" >
- | < LPAREN: "(" >
- | < RPAREN: ")" >
- | < SEMICOLON: ";" >
- | < COMMA: "," >
-
-}
-
-/* OPERATORS */
-
-TOKEN :
-{
- < MULT: "*" >
- | < DIV: "/" >
- | < MINUS: "-" >
- | < PLUS: "+" >
- | < GT: ">" >
- | < GE: ">=" >
- | < LT: "<" >
- | < LE: "<=" >
- | < NE: "<>" >
- | < EQ: "=" >
-
-}
-
-/* Literals */
-
-<DEFAULT> TOKEN : /* Numeric Literal */
-{
- < INTEGER_LITERAL:
- "-9223372036854775808"
- | "-9223372036854775808l"
- | "-9223372036854775808L"
- | <DECIMAL_LITERAL> (["l","L"])?
- | <HEX_LITERAL> (["l","L"])?
- | <OCTAL_LITERAL> (["l","L"])?
- >
-|
- < #DECIMAL_LITERAL: ["1"-"9"] (["0"-"9"])* >
-|
- < #HEX_LITERAL: "0" ["x","X"] (["0"-"9","a"-"f","A"-"F"])+ >
-|
- < #OCTAL_LITERAL: "0" (["0"-"7"])* >
-|
- < FLOATING_POINT_LITERAL:
- (["+","-"])? (["0"-"9"])+ "." (["0"-"9"])* (<EXPONENT>)? (["f","F","d","D"])?
- | "." (["0"-"9"])+ (<EXPONENT>)? (["f","F","d","D"])?
- | (["0"-"9"])+ <EXPONENT> (["f","F","d","D"])?
- | (["0"-"9"])+ (<EXPONENT>)? ["f","F","d","D"]
- >
-|
- < #EXPONENT: ["e","E"] (["+","-"])? (["0"-"9"])+ >
-}
-
-
-TOKEN :
-{
- < SIMPLE_STRING:
- "'"
- ( (~["'","\n","\r"])
- | ("''")
- )*
- "'"
- >
-}
-
-/* Function names */
-
-TOKEN :
-{
- < IDENTIFIER: <LETTER> (<LETTER>|<DIGIT>)* >
- |
- < #LETTER: [ "_","$", "a"-"z", "A"-"Z" ] >
- |
- < #DIGIT: ["0" - "9"] >
-}
-
-/** Start of the grammar */
-
-Object expression() :
-{
- Object exp1 = null;
-}
-{
- exp1=selectorExpression()<EOF>
- {
- return exp1;
- }
-}
-
-Object selectorExpression() :
-{
- Object exp1 = null;
- Object exp2 = null;
-}
-{
- exp1=selectorTerm()
- (
- <OR> exp2=selectorTerm()
- {
- exp1 = new Operator(Operator.OR, exp1, exp2);
- }
- )*
- {
- return exp1;
- }
-}
-
-Object selectorTerm() :
-{
- Object exp1 = null;
- Object exp2 = null;
-}
-{
- exp1=selectorFactor()
- (
- <AND> exp2=selectorFactor()
- {
- exp1 = new Operator(Operator.AND, exp1, exp2);
- }
- )*
- {
- return exp1;
- }
-}
-
-Object selectorFactor() :
-{
- Object exp1 = null;
-}
-{
- exp1=conditionalExpression()
- {
- return exp1;
- }
- | <NOT> exp1=conditionalExpression()
- {
- exp1 = new Operator(Operator.NOT, exp1);
- }
- {
- return exp1;
- }
-}
-
-Object conditionalExpression() :
-{
- Object exp1 = null;
-}
-{
- LOOKAHEAD(3)
- <LPAREN> exp1=selectorExpression() <RPAREN>
- {
- return exp1;
- }
- |
- exp1 = comparisonExpression()
- {
- return exp1;
- }
-}
-
-Object comparisonExpression() :
-{
- int op = -1;
- Set set = null;
- Object exp1 = null;
- Object exp2 = null;
- Object exp3 = null;
- Object id = null;
- Token not = null;
-}
-{
- LOOKAHEAD(2147483647)
- exp1=identifier() <IS> [ not=<NOT> ] <NULL>
- {
- int opCode = not == null ? Operator.IS_NULL : Operator.IS_NOT_NULL;
- return new Operator(opCode, exp1);
- }
- |
- LOOKAHEAD(2147483647)
- id=identifier() [ not=<NOT> ] <IN> <LPAREN> { set = new HashSet(); } stringList(set) <RPAREN>
- {
- if (not == null)
- return new Operator(Operator.IN, id, set);
- else
- return new Operator(Operator.NOT_IN, id, set);
- return exp1;
- }
- |
- LOOKAHEAD(2147483647)
- id=identifier() [ not=<NOT> ] <LIKE> exp1=patternExpression(id)
- {
- if (not != null)
- exp1 = new Operator(Operator.NOT, exp1);
- return exp1;
- }
- |
- LOOKAHEAD(2147483647)
- exp1=stringExpression()
- (
- <EQ>{ op = Operator.EQUAL;}
- | <NE>{ op = Operator.DIFFERENT;}
- ) exp2=stringExpression()
- {
- return new Operator(op, exp1, exp2);
- }
- |
- LOOKAHEAD(2147483647)
- exp1=booleanExpression()
- (
- <EQ>{ op = Operator.EQUAL;}
- | <NE>{ op = Operator.DIFFERENT;}
- ) exp2=booleanExpression()
- {
- return new Operator(op, exp1, exp2);
- }
- |
- LOOKAHEAD(2147483647)
- exp1=arithExpression()
- (
- <EQ>{ op = Operator.EQUAL;}
- | <NE>{ op = Operator.DIFFERENT;}
- | <GT>{ op = Operator.GT;}
- | <GE>{ op = Operator.GE;}
- | <LT>{ op = Operator.LT;}
- | <LE>{ op = Operator.LE;}
- ) exp2=arithExpression()
- {
- return new Operator(op, exp1, exp2);
- }
- |
- LOOKAHEAD(2147483647)
- exp1=arithExpression() [ not=<NOT> ] <BETWEEN> exp2=arithExpression() <AND> exp3=arithExpression()
- {
- exp1 = new Operator(Operator.BETWEEN, exp1, exp2, exp3);
- if (not != null)
- exp1 = new Operator(Operator.NOT, exp1);
- return exp1;
- }
- | exp1=booleanExpression()
- {
- return exp1;
- }
-}
-
-void stringList(Set set) :
-{
-}
-{
- stringToken(set) ( <COMMA> stringToken(set))*
-}
-
-void stringToken(Set set) :
-{
- Token t = null;
-}
-{
- [ t=<SIMPLE_STRING> ]
- {
- if (t != null)
- set.add(stripQuotes(t.image));
- }
-}
-
-Object patternExpression(Object exp1) :
-{
- Object exp2 = null;
- Token esc = null;
- Object escChar = null;
-}
-{
- exp2=stringLiteral() [ esc=<ESCAPE> escChar=stringLiteral() ]
- {
- Operator op = null;
- if (esc == null)
- op = new Operator(Operator.LIKE, exp1, exp2);
- else
- op = new Operator(Operator.LIKE_ESCAPE, exp1, exp2, escChar);
- return op;
- }
-}
-
-Object arithExpression() :
-{
- Object exp1 = null;
- Object exp2 = null;
-}
-{
- exp1=arithTerm()
- (
- <PLUS> exp2=arithTerm()
- {
- exp1 = new Operator(Operator.ADD, exp1, exp2);
- }
- | <MINUS> exp2=arithTerm()
- {
- exp1 = new Operator(Operator.SUB, exp1, exp2);
- }
- )*
- {
- return exp1;
- }
-}
-
-Object arithTerm() :
-{
- Object exp1 = null;
- Object exp2 = null;
-}
-{
- exp1=arithFactor()
- (
- <MULT> exp2=arithFactor()
- {
- exp1 = new Operator(Operator.MUL, exp1, exp2);
- }
- | <DIV> exp2=arithFactor()
- {
- exp1 = new Operator(Operator.DIV, exp1, exp2);
- }
- )*
- {
- return exp1;
- }
-}
-
-Object arithFactor() :
-{
- Object exp1 = null;
- boolean negate = false;
-}
-{
- [<PLUS>|<MINUS>{ negate = true; }] exp1=numericExpression()
- {
- if (negate)
- exp1 = new Operator(Operator.NEG, exp1);
- return exp1;
- }
-}
-
-Object booleanExpression() :
-{
- Object exp1 = null;
-}
-{
- (
- exp1=identifier()
- | exp1=booleanLiteral()
- )
- {
- return exp1;
- }
-}
-
-Object booleanLiteral() :
-{
- boolean isTrue = true;
-}
-{
- (<TRUE>|<FALSE>{ isTrue = false; })
- {
- if (isTrue)
- return Boolean.TRUE;
- else
- return Boolean.FALSE;
- }
-}
-
-Object stringExpression() :
-{
- Object exp1 = null;
-}
-{
- (
- exp1=identifier()
- | exp1=stringLiteral()
- )
- {
- return exp1;
- }
-}
-
-Object stringLiteral() :
-{
- Token string = null;
-}
-{
- string=<SIMPLE_STRING>
- {
- return stripQuotes(string.image);
- }
-}
-
-Object numericExpression() :
-{
- Object exp1 = null;
-}
-{
- (
- exp1 = numericLiteral()
- | (<LPAREN> exp1=arithExpression() <RPAREN>)
- | exp1 = identifier()
- )
- {
- return exp1;
- }
-}
-Object numericLiteral() :
-{
- Token literal = null;
-}
-{
- literal=<FLOATING_POINT_LITERAL>
- {
- return new Double(literal.image);
- }
- |
- literal=<INTEGER_LITERAL>
- {
- String number = literal.image;
-
- // long suffix
- if (number.endsWith(LOFFER_L) || number.endsWith(UPPER_L))
- {
- // chop off the suffix
- return new Long(number.substring(0, number.length() - 1));
- }
-
- // hex
- if (number.startsWith(OX) || number.startsWith(Ox))
- {
- // handle literals from 0x8000000000000000L to 0xffffffffffffffffL:
- // remove sign bit, parse as positive, then calculate the negative
- // value with the sign bit
- if(number.length() == 18)
- {
- byte first = Byte.decode(number.substring(0, 3)).byteValue();
- if (first >= 8)
- {
- number = Ox + (first - 8) + number.substring(3);
- return new Long(Long.decode(number).longValue() - Long.MAX_VALUE - 1);
- }
- }
- }
- else if (number.startsWith(ZERRO))
- {
- // octal
- // handle literals
- // from 01000000000000000000000L to 01777777777777777777777L
- // remove sign bit, parse as positive, then calculate the
- // negative value with the sign bit
- if (number.length() == 23)
- {
- if (number.charAt(1) == '1')
- {
- number = ZERRO + number.substring(2);
- return new Long(Long.decode(number).longValue() - Long.MAX_VALUE - 1);
- }
- }
- }
- return Long.decode(number);
- }
-}
-
-Object identifier() :
-{
- Token id = null;
-}
-{
- id=<IDENTIFIER>
- {
- SimpleString simage = new SimpleString(id.image);
- Identifier identifier = (Identifier) identifierMap.get(simage);
- if (identifier == null)
- {
- identifier = new Identifier(simage);
- identifierMap.put(simage, identifier);
- }
- return identifier;
- }
-}
Modified: trunk/hornetq-core-client/hornetq-core-client.iml
===================================================================
--- trunk/hornetq-core-client/hornetq-core-client.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/hornetq-core-client/hornetq-core-client.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
- <exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
Modified: trunk/hornetq-jms-client/hornetq-jms-client.iml
===================================================================
--- trunk/hornetq-jms-client/hornetq-jms-client.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/hornetq-jms-client/hornetq-jms-client.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
- <exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
Modified: trunk/hornetq-ra/hornetq-rar-pom.iml
===================================================================
--- trunk/hornetq-ra/hornetq-rar-pom.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/hornetq-ra/hornetq-rar-pom.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
- <exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
Modified: trunk/tests/concurrent-tests/concurrent-tests.iml
===================================================================
--- trunk/tests/concurrent-tests/concurrent-tests.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/tests/concurrent-tests/concurrent-tests.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MODULE_DIR$/../target/classes" />
+ <output-test url="file://$MODULE_DIR$/../target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
Modified: trunk/tests/hornetq-tests-pom.iml
===================================================================
--- trunk/tests/hornetq-tests-pom.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/tests/hornetq-tests-pom.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -3,7 +3,6 @@
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/target/classes" />
<output-test url="file://$MODULE_DIR$/target/test-classes" />
- <exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/target" />
</content>
Modified: trunk/tests/integration-tests/integration-tests.iml
===================================================================
--- trunk/tests/integration-tests/integration-tests.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/tests/integration-tests/integration-tests.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MODULE_DIR$/../target/classes" />
+ <output-test url="file://$MODULE_DIR$/../target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
- <excludeFolder url="file://$MODULE_DIR$/target" />
+ <sourceFolder url="file://$MODULE_DIR$/target/generated-sources/test-annotations" isTestSource="true" />
+ <excludeFolder url="file://$MODULE_DIR$/target/classes" />
+ <excludeFolder url="file://$MODULE_DIR$/target/maven-archiver" />
+ <excludeFolder url="file://$MODULE_DIR$/target/test-classes" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: trunk/tests/jms-tests/jms-tests.iml
===================================================================
--- trunk/tests/jms-tests/jms-tests.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/tests/jms-tests/jms-tests.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MODULE_DIR$/../target/classes" />
+ <output-test url="file://$MODULE_DIR$/../target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/config" isTestSource="true" />
Modified: trunk/tests/joram-tests/joram-tests.iml
===================================================================
--- trunk/tests/joram-tests/joram-tests.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/tests/joram-tests/joram-tests.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MODULE_DIR$/../target/classes" />
+ <output-test url="file://$MODULE_DIR$/../target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/config" isTestSource="true" />
Modified: trunk/tests/performance-tests/performance-tests.iml
===================================================================
--- trunk/tests/performance-tests/performance-tests.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/tests/performance-tests/performance-tests.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MODULE_DIR$/../target/classes" />
+ <output-test url="file://$MODULE_DIR$/../target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
Modified: trunk/tests/soak-tests/soak-tests.iml
===================================================================
--- trunk/tests/soak-tests/soak-tests.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/tests/soak-tests/soak-tests.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MODULE_DIR$/../target/classes" />
+ <output-test url="file://$MODULE_DIR$/../target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
Modified: trunk/tests/stress-tests/stress-tests.iml
===================================================================
--- trunk/tests/stress-tests/stress-tests.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/tests/stress-tests/stress-tests.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MODULE_DIR$/../target/classes" />
+ <output-test url="file://$MODULE_DIR$/../target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
Modified: trunk/tests/timing-tests/timing-tests.iml
===================================================================
--- trunk/tests/timing-tests/timing-tests.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/tests/timing-tests/timing-tests.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MODULE_DIR$/../target/classes" />
+ <output-test url="file://$MODULE_DIR$/../target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/target" />
Modified: trunk/tests/unit-tests/unit-tests.iml
===================================================================
--- trunk/tests/unit-tests/unit-tests.iml 2011-04-14 03:46:20 UTC (rev 10506)
+++ trunk/tests/unit-tests/unit-tests.iml 2011-04-14 11:16:55 UTC (rev 10507)
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
- <output url="file://$MODULE_DIR$/target/classes" />
- <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <output url="file://$MODULE_DIR$/../target/classes" />
+ <output-test url="file://$MODULE_DIR$/../target/test-classes" />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
More information about the hornetq-commits
mailing list