April 2011 - hornetq-commits - Jboss List Archives

JBoss hornetq SVN: r10511 - trunk/distribution/jnp-client.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2011-04-14 12:17:29 -0400 (Thu, 14 Apr 2011) New Revision: 10511 Modified: trunk/distribution/jnp-client/pom.xml Log: use parent folder instead of root Modified: trunk/distribution/jnp-client/pom.xml =================================================================== --- trunk/distribution/jnp-client/pom.xml 2011-04-14 15:27:35 UTC (rev 10510) +++ trunk/distribution/jnp-client/pom.xml 2011-04-14 16:17:29 UTC (rev 10511) @@ -5,7 +5,7 @@ <parent> <groupId>org.hornetq</groupId> - <artifactId>hornetq-pom</artifactId> + <artifactId>hornetq-distribution</artifactId> <version>2.2.3-SNAPSHOT</version> </parent>

13 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r10510 - in trunk/distribution: jnp-client and 1 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2011-04-14 11:27:35 -0400 (Thu, 14 Apr 2011) New Revision: 10510 Added: trunk/distribution/jnp-client/ trunk/distribution/jnp-client/jnp-client.iml trunk/distribution/jnp-client/pom.xml Modified: trunk/distribution/pom.xml trunk/distribution/src/main/assembly/dep.xml Log: added dependency for jnp client jar and removed version extensions from jars Added: trunk/distribution/jnp-client/jnp-client.iml =================================================================== --- trunk/distribution/jnp-client/jnp-client.iml (rev 0) +++ trunk/distribution/jnp-client/jnp-client.iml 2011-04-14 15:27:35 UTC (rev 10510) @@ -0,0 +1,17 @@ +<?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" /> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <excludeFolder url="file://$MODULE_DIR$/target" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" name="Maven: org.jboss.naming:jnpserver:5.0.3.GA" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" /> + </component> +</module> + Added: trunk/distribution/jnp-client/pom.xml =================================================================== --- trunk/distribution/jnp-client/pom.xml (rev 0) +++ trunk/distribution/jnp-client/pom.xml 2011-04-14 15:27:35 UTC (rev 10510) @@ -0,0 +1,83 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <modelVersion>4.0.0</modelVersion> + + + <parent> + <groupId>org.hornetq</groupId> + <artifactId>hornetq-pom</artifactId> + <version>2.2.3-SNAPSHOT</version> + </parent> + + <groupId>org.hornetq</groupId> + <artifactId>jnp-client</artifactId> + <packaging>jar</packaging> + <name>JBoss jnp client jar</name> + + <dependencies> + <dependency> + <groupId>org.jboss.naming</groupId> + <artifactId>jnpserver</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-spi</artifactId> + </dependency> + </dependencies> + + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + <filtering>true</filtering> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <excludes> + <exclude>org.jboss.netty:netty</exclude> + </excludes> + </artifactSet> + <filters> + <filter> + <artifact>org.jboss.naming:jnpserver</artifact> + <includes> + <include>org/jnp/interfaces/**/*.class</include> + <include>org/jboss/naming/**/*.class</include> + <include>org/jnp/server/NamingServer_Stub.class</include> + </includes> + </filter> + <filter> + <artifact>org.jboss.logging:jboss-logging-spi</artifact> + <includes> + <include>org/jboss/logging/**/*.class</include> + </includes> + </filter> + </filters> + </configuration> + </execution> + + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.6</source> + <target>1.6</target> + </configuration> + </plugin> + </plugins> + </build> + +</project> Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2011-04-14 15:04:10 UTC (rev 10509) +++ trunk/distribution/pom.xml 2011-04-14 15:27:35 UTC (rev 10510) @@ -25,6 +25,9 @@ </dependency> </dependencies> + <modules> + <module>jnp-client</module> + </modules> <build> <resources> Modified: trunk/distribution/src/main/assembly/dep.xml =================================================================== --- trunk/distribution/src/main/assembly/dep.xml 2011-04-14 15:04:10 UTC (rev 10509) +++ trunk/distribution/src/main/assembly/dep.xml 2011-04-14 15:27:35 UTC (rev 10510) @@ -18,6 +18,7 @@ <includeDependencies>false</includeDependencies> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> </binaries> </moduleSet> <moduleSet> @@ -29,6 +30,7 @@ <includeDependencies>false</includeDependencies> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> </binaries> </moduleSet> <moduleSet> @@ -56,6 +58,7 @@ <includeDependencies>false</includeDependencies> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> </binaries> </moduleSet> <moduleSet> @@ -67,6 +70,7 @@ <includeDependencies>false</includeDependencies> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> </binaries> </moduleSet> <moduleSet> @@ -83,6 +87,7 @@ <include>**/*.xsd</include> </includes> </unpackOptions> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> </binaries> </moduleSet> <moduleSet> @@ -94,6 +99,7 @@ <includeDependencies>false</includeDependencies> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> </binaries> </moduleSet> <moduleSet> <useAllReactorProjects>true</useAllReactorProjects> @@ -104,6 +110,7 @@ <includeDependencies>false</includeDependencies> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> </binaries> </moduleSet> <moduleSet> @@ -115,6 +122,7 @@ <includeDependencies>false</includeDependencies> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> </binaries> </moduleSet> <!-- @@ -137,6 +145,7 @@ <includeDependencies>false</includeDependencies> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> </binaries> </moduleSet> <moduleSet> @@ -148,6 +157,7 @@ <includeDependencies>false</includeDependencies> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> </binaries> </moduleSet> <moduleSet> @@ -159,11 +169,24 @@ <includeDependencies>false</includeDependencies> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> </binaries> </moduleSet> <moduleSet> <useAllReactorProjects>true</useAllReactorProjects> <includes> + <include>org.hornetq:jnp-client</include> + </includes> + <binaries> + <includeDependencies>false</includeDependencies> + <outputDirectory>lib</outputDirectory> + <unpack>false</unpack> + <outputFileNameMapping>${module.artifactId}.${module.extension}</outputFileNameMapping> + </binaries> + </moduleSet> + <moduleSet> + <useAllReactorProjects>true</useAllReactorProjects> + <includes> <include>org.hornetq:hornetq-examples</include> </includes> <sources> <includeModuleDirectory>false</includeModuleDirectory> @@ -196,6 +219,7 @@ </includes> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> + <outputFileNameMapping>jboss-jms-api.jar</outputFileNameMapping> </dependencySet> <dependencySet> <includes> @@ -203,6 +227,7 @@ </includes> <outputDirectory>lib</outputDirectory> <unpack>false</unpack> + <outputFileNameMapping>jnpserver.jar</outputFileNameMapping> </dependencySet> </dependencySets> <fileSets>

13 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r10509 - in trunk/distribution: src/main/assembly and 1 other directory.

by do-not-reply＠jboss.org

Author: ataylor Date: 2011-04-14 11:04:10 -0400 (Thu, 14 Apr 2011) New Revision: 10509 Modified: trunk/distribution/hornetq-distribution.iml trunk/distribution/pom.xml trunk/distribution/src/main/assembly/dep.xml Log: added dependency for jnpserver and jms api Modified: trunk/distribution/hornetq-distribution.iml =================================================================== --- trunk/distribution/hornetq-distribution.iml 2011-04-14 14:07:35 UTC (rev 10508) +++ trunk/distribution/hornetq-distribution.iml 2011-04-14 15:04:10 UTC (rev 10509) @@ -9,6 +9,10 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-jms-api:1.1.0.GA" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.naming:jnpserver:5.0.3.GA" level="project" /> + <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.14.GA" level="project" /> + <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.1.0.GA" level="project" /> </component> </module> Modified: trunk/distribution/pom.xml =================================================================== --- trunk/distribution/pom.xml 2011-04-14 14:07:35 UTC (rev 10508) +++ trunk/distribution/pom.xml 2011-04-14 15:04:10 UTC (rev 10509) @@ -13,6 +13,19 @@ <packaging>pom</packaging> <name>HornetQ Distribution</name> + + <dependencies> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-jms-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.naming</groupId> + <artifactId>jnpserver</artifactId> + </dependency> + </dependencies> + + <build> <resources> <resource> Modified: trunk/distribution/src/main/assembly/dep.xml =================================================================== --- trunk/distribution/src/main/assembly/dep.xml 2011-04-14 14:07:35 UTC (rev 10508) +++ trunk/distribution/src/main/assembly/dep.xml 2011-04-14 15:04:10 UTC (rev 10509) @@ -68,16 +68,6 @@ <outputDirectory>lib</outputDirectory> <unpack>false</unpack> </binaries> - </moduleSet> <moduleSet> - <useAllReactorProjects>true</useAllReactorProjects> - <includes> - <include>org.hornetq:hornetq-jms</include> - </includes> - <binaries> - <includeDependencies>false</includeDependencies> - <outputDirectory>lib</outputDirectory> - <unpack>false</unpack> - </binaries> </moduleSet> <moduleSet> <useAllReactorProjects>true</useAllReactorProjects> @@ -199,6 +189,22 @@ </sources> </moduleSet> </moduleSets> + <dependencySets> + <dependencySet> + <includes> + <include>org.jboss.javaee:jboss-jms-api</include> + </includes> + <outputDirectory>lib</outputDirectory> + <unpack>false</unpack> + </dependencySet> + <dependencySet> + <includes> + <include>org.jboss.naming:jnpserver</include> + </includes> + <outputDirectory>lib</outputDirectory> + <unpack>false</unpack> + </dependencySet> + </dependencySets> <fileSets> <fileSet> <directory>src/main/resources/config</directory>

13 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r10508 - in trunk: distribution/src/main/resources and 104 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2011-04-14 10:07:35 -0400 (Thu, 14 Apr 2011) New Revision: 10508 Added: trunk/distribution/src/main/resources/examples/ trunk/distribution/src/main/resources/examples/common/ trunk/distribution/src/main/resources/examples/common/config/ trunk/distribution/src/main/resources/examples/common/config/ant.properties trunk/distribution/src/main/resources/examples/javaee/ trunk/distribution/src/main/resources/examples/javaee/common/ trunk/distribution/src/main/resources/examples/javaee/common/config/ trunk/distribution/src/main/resources/examples/javaee/common/config/ant.properties Removed: trunk/distribution/src/main/resources/config/examples-ant.properties trunk/distribution/src/main/resources/config/javaee-examples-ant.properties Modified: trunk/distribution/src/main/assembly/dep.xml trunk/examples/common/build.xml trunk/examples/core/embedded-remote/build.sh trunk/examples/core/embedded/build.sh trunk/examples/core/microcontainer/build.sh trunk/examples/core/perf/build.sh trunk/examples/core/twitter-connector/build.sh trunk/examples/javaee/ejb-jms-transaction/build.sh trunk/examples/javaee/hajndi/build.sh trunk/examples/javaee/jca-config/build.sh trunk/examples/javaee/jca-remote/build.sh trunk/examples/javaee/jms-bridge/build.sh trunk/examples/javaee/mdb-bmt/build.sh trunk/examples/javaee/mdb-cmt-setrollbackonly/build.sh trunk/examples/javaee/mdb-cmt-tx-local/build.sh trunk/examples/javaee/mdb-cmt-tx-not-supported/build.sh trunk/examples/javaee/mdb-cmt-tx-required/build.sh trunk/examples/javaee/mdb-message-selector/build.sh trunk/examples/javaee/mdb-remote-failover-static/build.sh trunk/examples/javaee/mdb-remote-failover/build.sh trunk/examples/javaee/mdb-tx-send/build.sh trunk/examples/javaee/servlet-ssl/build.sh trunk/examples/javaee/servlet-transport/build.sh trunk/examples/javaee/xarecovery/build.sh trunk/examples/jms/applet/build.sh trunk/examples/jms/application-layer-failover/build.sh trunk/examples/jms/bridge/build.sh trunk/examples/jms/browser/build.sh trunk/examples/jms/client-kickoff/build.sh trunk/examples/jms/client-side-load-balancing/build.sh trunk/examples/jms/clustered-durable-subscription/build.sh trunk/examples/jms/clustered-grouping/build.sh trunk/examples/jms/clustered-queue/build.sh trunk/examples/jms/clustered-standalone/build.sh trunk/examples/jms/clustered-static-discovery/build.sh trunk/examples/jms/clustered-static-oneway/build.sh trunk/examples/jms/clustered-topic/build.sh trunk/examples/jms/consumer-rate-limit/build.sh trunk/examples/jms/dead-letter/build.sh trunk/examples/jms/delayed-redelivery/build.sh trunk/examples/jms/divert/build.sh trunk/examples/jms/durable-subscription/build.sh trunk/examples/jms/embedded-simple/build.sh trunk/examples/jms/embedded/build.sh trunk/examples/jms/expiry/build.sh trunk/examples/jms/http-transport/build.sh trunk/examples/jms/instantiate-connection-factory/build.sh trunk/examples/jms/interceptor/build.sh trunk/examples/jms/jaas/build.sh trunk/examples/jms/jms-bridge/build.sh trunk/examples/jms/jmx/build.sh trunk/examples/jms/large-message/build.sh trunk/examples/jms/last-value-queue/build.sh trunk/examples/jms/management-notifications/build.sh trunk/examples/jms/management/build.sh trunk/examples/jms/message-counters/build.sh trunk/examples/jms/message-group/build.sh trunk/examples/jms/message-group2/build.sh trunk/examples/jms/message-priority/build.sh trunk/examples/jms/multiple-failover-failback/build.sh trunk/examples/jms/multiple-failover/build.sh trunk/examples/jms/no-consumer-buffering/build.sh trunk/examples/jms/non-transaction-failover/build.sh trunk/examples/jms/paging/build.sh trunk/examples/jms/perf/build.sh trunk/examples/jms/pre-acknowledge/build.sh trunk/examples/jms/producer-rate-limit/build.sh trunk/examples/jms/queue-message-redistribution/build.sh trunk/examples/jms/queue-requestor/build.sh trunk/examples/jms/queue-selector/build.sh trunk/examples/jms/queue/build.sh trunk/examples/jms/reattach-node/build.sh trunk/examples/jms/request-reply/build.sh trunk/examples/jms/scheduled-message/build.sh trunk/examples/jms/security/build.sh trunk/examples/jms/send-acknowledgements/build.sh trunk/examples/jms/spring-integration/build.sh trunk/examples/jms/ssl-enabled/build.sh trunk/examples/jms/static-selector-jms/build.sh trunk/examples/jms/static-selector/build.sh trunk/examples/jms/stomp-websockets/build.sh trunk/examples/jms/stomp/build.sh trunk/examples/jms/stop-server-failover/build.sh trunk/examples/jms/symmetric-cluster/build.sh trunk/examples/jms/temp-queue/build.sh trunk/examples/jms/topic-hierarchies/build.sh trunk/examples/jms/topic-selector-example1/build.sh trunk/examples/jms/topic-selector-example2/build.sh trunk/examples/jms/topic/build.sh trunk/examples/jms/transaction-failover/build.sh trunk/examples/jms/transactional/build.sh trunk/examples/jms/xa-heuristic/build.sh trunk/examples/jms/xa-receive/build.sh trunk/examples/jms/xa-send/build.sh trunk/examples/jms/xa-with-jta/build.sh trunk/examples/pom.xml trunk/examples/soak/tx-restarts/build.sh trunk/examples/src/main/assembly/dep.xml Log: cleaned up examples build Modified: trunk/distribution/src/main/assembly/dep.xml =================================================================== --- trunk/distribution/src/main/assembly/dep.xml 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/distribution/src/main/assembly/dep.xml 2011-04-14 14:07:35 UTC (rev 10508) @@ -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> + <format>zip</format> <format>dir</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> <moduleSets> -  + </moduleSet>  -  + </moduleSet> <moduleSet> <useAllReactorProjects>true</useAllReactorProjects> <includes> <include>org.hornetq:hornetq-examples</include> - </includes> - <sources> + </includes> <sources> + <includeModuleDirectory>false</includeModuleDirectory> + <fileSets> + <fileSet> <outputDirectory>examples</outputDirectory> - </sources> -  + <includes> + <include>bin/**</include> + <include>common/**</include> + <include>core/**</include> + <include>javaee/**</include> + <include>jms/**</include> + <include>soak/**</include> + <include>tools/**</include> + <include>build.xml</include> + </includes> + <excludes> + <exclude>common/config/ant.properties</exclude> + <exclude>javaee/common/config/ant.properties</exclude> + </excludes> + </fileSet> + </fileSets> + </sources> </moduleSet> </moduleSets> -  + <fileSet> + <directory>src/main/resources/examples</directory> + <outputDirectory>examples</outputDirectory> + </fileSet> + </fileSets> </assembly> Deleted: trunk/distribution/src/main/resources/config/examples-ant.properties =================================================================== --- trunk/distribution/src/main/resources/config/examples-ant.properties 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/distribution/src/main/resources/config/examples-ant.properties 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,4 +0,0 @@ -hornetq.example.logserveroutput=true -hornetq.jars.dir=${imported.basedir}/../../lib -jars.dir=${imported.basedir}/../../lib -aio.library.path=${imported.basedir}/../../bin \ No newline at end of file Deleted: trunk/distribution/src/main/resources/config/javaee-examples-ant.properties =================================================================== --- trunk/distribution/src/main/resources/config/javaee-examples-ant.properties 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/distribution/src/main/resources/config/javaee-examples-ant.properties 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,4 +0,0 @@ -hornetq.example.logserveroutput=true -hornetq.jars.dir=${imported.basedir}/../../../lib -jars.dir=${imported.basedir}/../../../lib -aio.library.path=${imported.basedir}/../../native/bin Added: trunk/distribution/src/main/resources/examples/common/config/ant.properties =================================================================== --- trunk/distribution/src/main/resources/examples/common/config/ant.properties (rev 0) +++ trunk/distribution/src/main/resources/examples/common/config/ant.properties 2011-04-14 14:07:35 UTC (rev 10508) @@ -0,0 +1,4 @@ +hornetq.example.logserveroutput=true +hornetq.jars.dir=${imported.basedir}/../../lib +jars.dir=${imported.basedir}/../../lib +aio.library.path=${imported.basedir}/../../bin \ No newline at end of file Added: trunk/distribution/src/main/resources/examples/javaee/common/config/ant.properties =================================================================== --- trunk/distribution/src/main/resources/examples/javaee/common/config/ant.properties (rev 0) +++ trunk/distribution/src/main/resources/examples/javaee/common/config/ant.properties 2011-04-14 14:07:35 UTC (rev 10508) @@ -0,0 +1,4 @@ +hornetq.example.logserveroutput=true +hornetq.jars.dir=${imported.basedir}/../../../lib +jars.dir=${imported.basedir}/../../../lib +aio.library.path=${imported.basedir}/../../native/bin Modified: trunk/examples/common/build.xml =================================================================== --- trunk/examples/common/build.xml 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/common/build.xml 2011-04-14 14:07:35 UTC (rev 10508) @@ -14,7 +14,7 @@ ~ implied. See the License for the specific language governing ~ permissions and limitations under the License. --> -<project default="compile" name="example" basedir=""> +<project default="compile" name="example" basedir="."> <property name="hornetq.run_script" value="false" /> Modified: trunk/examples/core/embedded/build.sh =================================================================== --- trunk/examples/core/embedded/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/core/embedded/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/core/embedded-remote/build.sh =================================================================== --- trunk/examples/core/embedded-remote/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/core/embedded-remote/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/core/microcontainer/build.sh =================================================================== --- trunk/examples/core/microcontainer/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/core/microcontainer/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/core/perf/build.sh =================================================================== --- trunk/examples/core/perf/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/core/perf/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/core/twitter-connector/build.sh =================================================================== --- trunk/examples/core/twitter-connector/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/core/twitter-connector/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -x -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/ejb-jms-transaction/build.sh =================================================================== --- trunk/examples/javaee/ejb-jms-transaction/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/ejb-jms-transaction/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/hajndi/build.sh =================================================================== --- trunk/examples/javaee/hajndi/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/hajndi/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/jca-config/build.sh =================================================================== --- trunk/examples/javaee/jca-config/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/jca-config/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/jca-remote/build.sh =================================================================== --- trunk/examples/javaee/jca-remote/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/jca-remote/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/jms-bridge/build.sh =================================================================== --- trunk/examples/javaee/jms-bridge/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/jms-bridge/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/mdb-bmt/build.sh =================================================================== --- trunk/examples/javaee/mdb-bmt/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/mdb-bmt/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/mdb-cmt-setrollbackonly/build.sh =================================================================== --- trunk/examples/javaee/mdb-cmt-setrollbackonly/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/mdb-cmt-setrollbackonly/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/mdb-cmt-tx-local/build.sh =================================================================== --- trunk/examples/javaee/mdb-cmt-tx-local/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/mdb-cmt-tx-local/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/mdb-cmt-tx-not-supported/build.sh =================================================================== --- trunk/examples/javaee/mdb-cmt-tx-not-supported/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/mdb-cmt-tx-not-supported/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/mdb-cmt-tx-required/build.sh =================================================================== --- trunk/examples/javaee/mdb-cmt-tx-required/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/mdb-cmt-tx-required/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/mdb-message-selector/build.sh =================================================================== --- trunk/examples/javaee/mdb-message-selector/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/mdb-message-selector/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/mdb-remote-failover/build.sh =================================================================== --- trunk/examples/javaee/mdb-remote-failover/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/mdb-remote-failover/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/mdb-remote-failover-static/build.sh =================================================================== --- trunk/examples/javaee/mdb-remote-failover-static/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/mdb-remote-failover-static/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/mdb-tx-send/build.sh =================================================================== --- trunk/examples/javaee/mdb-tx-send/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/mdb-tx-send/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/servlet-ssl/build.sh =================================================================== --- trunk/examples/javaee/servlet-ssl/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/servlet-ssl/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/servlet-transport/build.sh =================================================================== --- trunk/examples/javaee/servlet-transport/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/servlet-transport/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/javaee/xarecovery/build.sh =================================================================== --- trunk/examples/javaee/xarecovery/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/javaee/xarecovery/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/applet/build.sh =================================================================== --- trunk/examples/jms/applet/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/applet/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/application-layer-failover/build.sh =================================================================== --- trunk/examples/jms/application-layer-failover/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/application-layer-failover/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/bridge/build.sh =================================================================== --- trunk/examples/jms/bridge/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/bridge/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/browser/build.sh =================================================================== --- trunk/examples/jms/browser/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/browser/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/client-kickoff/build.sh =================================================================== --- trunk/examples/jms/client-kickoff/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/client-kickoff/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/client-side-load-balancing/build.sh =================================================================== --- trunk/examples/jms/client-side-load-balancing/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/client-side-load-balancing/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/clustered-durable-subscription/build.sh =================================================================== --- trunk/examples/jms/clustered-durable-subscription/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/clustered-durable-subscription/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/clustered-grouping/build.sh =================================================================== --- trunk/examples/jms/clustered-grouping/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/clustered-grouping/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/clustered-queue/build.sh =================================================================== --- trunk/examples/jms/clustered-queue/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/clustered-queue/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/clustered-standalone/build.sh =================================================================== --- trunk/examples/jms/clustered-standalone/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/clustered-standalone/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/clustered-static-discovery/build.sh =================================================================== --- trunk/examples/jms/clustered-static-discovery/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/clustered-static-discovery/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/clustered-static-oneway/build.sh =================================================================== --- trunk/examples/jms/clustered-static-oneway/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/clustered-static-oneway/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/clustered-topic/build.sh =================================================================== --- trunk/examples/jms/clustered-topic/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/clustered-topic/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/consumer-rate-limit/build.sh =================================================================== --- trunk/examples/jms/consumer-rate-limit/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/consumer-rate-limit/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/dead-letter/build.sh =================================================================== --- trunk/examples/jms/dead-letter/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/dead-letter/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/delayed-redelivery/build.sh =================================================================== --- trunk/examples/jms/delayed-redelivery/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/delayed-redelivery/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/divert/build.sh =================================================================== --- trunk/examples/jms/divert/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/divert/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/durable-subscription/build.sh =================================================================== --- trunk/examples/jms/durable-subscription/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/durable-subscription/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/embedded/build.sh =================================================================== --- trunk/examples/jms/embedded/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/embedded/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/embedded-simple/build.sh =================================================================== --- trunk/examples/jms/embedded-simple/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/embedded-simple/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/expiry/build.sh =================================================================== --- trunk/examples/jms/expiry/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/expiry/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/http-transport/build.sh =================================================================== --- trunk/examples/jms/http-transport/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/http-transport/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/instantiate-connection-factory/build.sh =================================================================== --- trunk/examples/jms/instantiate-connection-factory/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/instantiate-connection-factory/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/interceptor/build.sh =================================================================== --- trunk/examples/jms/interceptor/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/interceptor/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/jaas/build.sh =================================================================== --- trunk/examples/jms/jaas/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/jaas/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/jms-bridge/build.sh =================================================================== --- trunk/examples/jms/jms-bridge/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/jms-bridge/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/jmx/build.sh =================================================================== --- trunk/examples/jms/jmx/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/jmx/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/large-message/build.sh =================================================================== --- trunk/examples/jms/large-message/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/large-message/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/last-value-queue/build.sh =================================================================== --- trunk/examples/jms/last-value-queue/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/last-value-queue/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/management/build.sh =================================================================== --- trunk/examples/jms/management/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/management/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/management-notifications/build.sh =================================================================== --- trunk/examples/jms/management-notifications/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/management-notifications/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/message-counters/build.sh =================================================================== --- trunk/examples/jms/message-counters/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/message-counters/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/message-group/build.sh =================================================================== --- trunk/examples/jms/message-group/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/message-group/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/message-group2/build.sh =================================================================== --- trunk/examples/jms/message-group2/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/message-group2/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/message-priority/build.sh =================================================================== --- trunk/examples/jms/message-priority/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/message-priority/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/multiple-failover/build.sh =================================================================== --- trunk/examples/jms/multiple-failover/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/multiple-failover/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/multiple-failover-failback/build.sh =================================================================== --- trunk/examples/jms/multiple-failover-failback/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/multiple-failover-failback/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/no-consumer-buffering/build.sh =================================================================== --- trunk/examples/jms/no-consumer-buffering/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/no-consumer-buffering/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/non-transaction-failover/build.sh =================================================================== --- trunk/examples/jms/non-transaction-failover/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/non-transaction-failover/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/paging/build.sh =================================================================== --- trunk/examples/jms/paging/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/paging/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/perf/build.sh =================================================================== --- trunk/examples/jms/perf/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/perf/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/pre-acknowledge/build.sh =================================================================== --- trunk/examples/jms/pre-acknowledge/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/pre-acknowledge/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/producer-rate-limit/build.sh =================================================================== --- trunk/examples/jms/producer-rate-limit/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/producer-rate-limit/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/queue/build.sh =================================================================== --- trunk/examples/jms/queue/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/queue/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/queue-message-redistribution/build.sh =================================================================== --- trunk/examples/jms/queue-message-redistribution/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/queue-message-redistribution/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/queue-requestor/build.sh =================================================================== --- trunk/examples/jms/queue-requestor/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/queue-requestor/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/queue-selector/build.sh =================================================================== --- trunk/examples/jms/queue-selector/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/queue-selector/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/reattach-node/build.sh =================================================================== --- trunk/examples/jms/reattach-node/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/reattach-node/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/request-reply/build.sh =================================================================== --- trunk/examples/jms/request-reply/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/request-reply/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/scheduled-message/build.sh =================================================================== --- trunk/examples/jms/scheduled-message/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/scheduled-message/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/security/build.sh =================================================================== --- trunk/examples/jms/security/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/security/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/send-acknowledgements/build.sh =================================================================== --- trunk/examples/jms/send-acknowledgements/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/send-acknowledgements/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/spring-integration/build.sh =================================================================== --- trunk/examples/jms/spring-integration/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/spring-integration/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/ssl-enabled/build.sh =================================================================== --- trunk/examples/jms/ssl-enabled/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/ssl-enabled/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/static-selector/build.sh =================================================================== --- trunk/examples/jms/static-selector/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/static-selector/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/static-selector-jms/build.sh =================================================================== --- trunk/examples/jms/static-selector-jms/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/static-selector-jms/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/stomp/build.sh =================================================================== --- trunk/examples/jms/stomp/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/stomp/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/stomp-websockets/build.sh =================================================================== --- trunk/examples/jms/stomp-websockets/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/stomp-websockets/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/stop-server-failover/build.sh =================================================================== --- trunk/examples/jms/stop-server-failover/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/stop-server-failover/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/symmetric-cluster/build.sh =================================================================== --- trunk/examples/jms/symmetric-cluster/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/symmetric-cluster/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/temp-queue/build.sh =================================================================== --- trunk/examples/jms/temp-queue/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/temp-queue/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/topic/build.sh =================================================================== --- trunk/examples/jms/topic/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/topic/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/topic-hierarchies/build.sh =================================================================== --- trunk/examples/jms/topic-hierarchies/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/topic-hierarchies/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/topic-selector-example1/build.sh =================================================================== --- trunk/examples/jms/topic-selector-example1/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/topic-selector-example1/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/topic-selector-example2/build.sh =================================================================== --- trunk/examples/jms/topic-selector-example2/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/topic-selector-example2/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/transaction-failover/build.sh =================================================================== --- trunk/examples/jms/transaction-failover/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/transaction-failover/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/transactional/build.sh =================================================================== --- trunk/examples/jms/transactional/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/transactional/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/xa-heuristic/build.sh =================================================================== --- trunk/examples/jms/xa-heuristic/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/xa-heuristic/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/xa-receive/build.sh =================================================================== --- trunk/examples/jms/xa-receive/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/xa-receive/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/xa-send/build.sh =================================================================== --- trunk/examples/jms/xa-send/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/xa-send/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/jms/xa-with-jta/build.sh =================================================================== --- trunk/examples/jms/xa-with-jta/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/jms/xa-with-jta/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/pom.xml =================================================================== --- trunk/examples/pom.xml 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/pom.xml 2011-04-14 14:07:35 UTC (rev 10508) @@ -10,7 +10,7 @@ <groupId>org.hornetq</groupId> <artifactId>hornetq-examples</artifactId> - <packaging>jar</packaging> + <packaging>pom</packaging> <name>HornetQ Examples</name> <build> Modified: trunk/examples/soak/tx-restarts/build.sh =================================================================== --- trunk/examples/soak/tx-restarts/build.sh 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/soak/tx-restarts/build.sh 2011-04-14 14:07:35 UTC (rev 10508) @@ -1,6 +1,6 @@ #!/bin/sh -OVERRIDE_ANT_HOME=../../../tools/ant +OVERRIDE_ANT_HOME=../../tools/ant export OVERRIDE_ANT_HOME if [ -f "../../../src/bin/build.sh" ]; then @@ -8,7 +8,7 @@ ../../../src/bin/build.sh "$@" else # running from the distro - ../../../bin/build.sh "$@" + ../../bin/build.sh "$@" fi Modified: trunk/examples/src/main/assembly/dep.xml =================================================================== --- trunk/examples/src/main/assembly/dep.xml 2011-04-14 11:16:55 UTC (rev 10507) +++ trunk/examples/src/main/assembly/dep.xml 2011-04-14 14:07:35 UTC (rev 10508) @@ -13,21 +13,43 @@ <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> + <id>bin</id> <formats> <format>zip</format> </formats> + <includeBaseDirectory>false</includeBaseDirectory> <fileSets> <fileSet> -  + <directory>${project.basedir}/bin</directory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/common</directory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/core</directory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/javaee</directory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/jms</directory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/soak</directory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + <fileSet> + <directory>${project.basedir}/tools</directory> + <useDefaultExcludes>true</useDefaultExcludes> + </fileSet> + <fileSet> <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>

13 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r10507 - in trunk: distribution/src/main/assembly and 23 other directories.

by do-not-reply＠jboss.org

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>dir</format> </formats> <includeBaseDirectory>false</includeBaseDirectory> <moduleSets> - <moduleSet> +   - <moduleSet> +  <moduleSet> <useAllReactorProjects>true</useAllReactorProjects> <includes> <include>org.hornetq:hornetq-examples</include> </includes> - <binaries> + <sources> + <outputDirectory>examples</outputDirectory> + </sources> +  </moduleSet> </moduleSets> - <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"> + ]> + + + + + + + + + + + + + + + + + + + + + + + + + + +<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 @@ + + +<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> +  + <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"> - ]> - - - - - - - - - - - - - - - - - - - - - - - - - - -<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(a)jboss.org - * @author adrian(a)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" />

13 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r10506 - in branches/Branch_2_2_EAP: src/main/org/hornetq/core/protocol/core and 2 other directories.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2011-04-13 23:46:20 -0400 (Wed, 13 Apr 2011) New Revision: 10506 Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java Log: JBPAPP-6300 - small tweak on metadata (fixing a test (that was failing eventually under a normal circunstance)) Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2011-04-14 03:30:16 UTC (rev 10505) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2011-04-14 03:46:20 UTC (rev 10506) @@ -1099,7 +1099,7 @@ public void addMetaData(String key, String data) throws HornetQException { metadata.put(key, data); - channel.send(new SessionAddMetaDataMessageV2(key, data)); + channel.sendBlocking(new SessionAddMetaDataMessageV2(key, data)); } public ClientSessionFactoryInternal getSessionFactory() Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2011-04-14 03:30:16 UTC (rev 10505) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/ServerSessionPacketHandler.java 2011-04-14 03:46:20 UTC (rev 10506) @@ -483,6 +483,10 @@ case PacketImpl.SESS_ADD_METADATA2: { SessionAddMetaDataMessageV2 message = (SessionAddMetaDataMessageV2)packet; + if (message.isRequiresConfirmations()) + { + response = new NullResponseMessage(); + } session.addMetaData(message.getKey(), message.getData()); break; } Modified: branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java =================================================================== --- branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java 2011-04-14 03:30:16 UTC (rev 10505) +++ branches/Branch_2_2_EAP/src/main/org/hornetq/core/protocol/core/impl/wireformat/SessionAddMetaDataMessageV2.java 2011-04-14 03:46:20 UTC (rev 10506) @@ -76,8 +76,6 @@ return requiresConfirmation; } - - public String getKey() { return key; Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2011-04-14 03:30:16 UTC (rev 10505) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2011-04-14 03:46:20 UTC (rev 10506) @@ -556,23 +556,9 @@ JMSServerControl2Test.PING_PERIOD); Connection connection = cf1.createConnection(); - long timeout = System.currentTimeMillis() + 5000; - - // Some of the send is asynchronous, so need to wait a few micro seconds eventually - while (System.currentTimeMillis() < timeout) - { - jsonStr = control.listConnectionsAsJSON(); - assertNotNull(jsonStr); - infos = JMSConnectionInfo.from(jsonStr); - if (infos.length == 1) - { - break; - } - else - { - Thread.sleep(500); - } - } + jsonStr = control.listConnectionsAsJSON(); + assertNotNull(jsonStr); + infos = JMSConnectionInfo.from(jsonStr); assertEquals(1, infos.length); for (JMSConnectionInfo info : infos) { @@ -586,25 +572,9 @@ JMSServerControl2Test.PING_PERIOD); Connection connection2 = cf2.createConnection(); - timeout = System.currentTimeMillis() + 5000; - - // Some of the send is asynchronous, so need to wait a few micro seconds eventually - while (System.currentTimeMillis() < timeout) - { - jsonStr = control.listConnectionsAsJSON(); - assertNotNull(jsonStr); - infos = JMSConnectionInfo.from(jsonStr); - - if (infos.length == 2) - { - break; - } - else - { - Thread.sleep(500); - } - } - + jsonStr = control.listConnectionsAsJSON(); + assertNotNull(jsonStr); + infos = JMSConnectionInfo.from(jsonStr); assertEquals(2, infos.length); for (JMSConnectionInfo info : infos) {

13 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r10505 - branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2011-04-13 23:30:16 -0400 (Wed, 13 Apr 2011) New Revision: 10505 Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java Log: Fixing test (adding wait because of async calls) - after JBAPP-6300 Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2011-04-13 22:39:12 UTC (rev 10504) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2011-04-14 03:30:16 UTC (rev 10505) @@ -556,9 +556,23 @@ JMSServerControl2Test.PING_PERIOD); Connection connection = cf1.createConnection(); - jsonStr = control.listConnectionsAsJSON(); - assertNotNull(jsonStr); - infos = JMSConnectionInfo.from(jsonStr); + long timeout = System.currentTimeMillis() + 5000; + + // Some of the send is asynchronous, so need to wait a few micro seconds eventually + while (System.currentTimeMillis() < timeout) + { + jsonStr = control.listConnectionsAsJSON(); + assertNotNull(jsonStr); + infos = JMSConnectionInfo.from(jsonStr); + if (infos.length == 1) + { + break; + } + else + { + Thread.sleep(500); + } + } assertEquals(1, infos.length); for (JMSConnectionInfo info : infos) { @@ -572,9 +586,25 @@ JMSServerControl2Test.PING_PERIOD); Connection connection2 = cf2.createConnection(); - jsonStr = control.listConnectionsAsJSON(); - assertNotNull(jsonStr); - infos = JMSConnectionInfo.from(jsonStr); + timeout = System.currentTimeMillis() + 5000; + + // Some of the send is asynchronous, so need to wait a few micro seconds eventually + while (System.currentTimeMillis() < timeout) + { + jsonStr = control.listConnectionsAsJSON(); + assertNotNull(jsonStr); + infos = JMSConnectionInfo.from(jsonStr); + + if (infos.length == 2) + { + break; + } + else + { + Thread.sleep(500); + } + } + assertEquals(2, infos.length); for (JMSConnectionInfo info : infos) {

13 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r10504 - in trunk/hornetq-ra: hornetq-ra-rar and 1 other directory.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2011-04-13 18:39:12 -0400 (Wed, 13 Apr 2011) New Revision: 10504 Modified: trunk/hornetq-ra/hornetq-ra-jar/ trunk/hornetq-ra/hornetq-ra-jar/pom.xml trunk/hornetq-ra/hornetq-ra-rar/ trunk/hornetq-ra/hornetq-ra-rar/pom.xml Log: fixing build Property changes on: trunk/hornetq-ra/hornetq-ra-jar ___________________________________________________________________ Added: svn:ignore + target Modified: trunk/hornetq-ra/hornetq-ra-jar/pom.xml =================================================================== --- trunk/hornetq-ra/hornetq-ra-jar/pom.xml 2011-04-13 20:59:23 UTC (rev 10503) +++ trunk/hornetq-ra/hornetq-ra-jar/pom.xml 2011-04-13 22:39:12 UTC (rev 10504) @@ -4,7 +4,7 @@ <parent> <groupId>org.hornetq</groupId> - <artifactId>hornetq-pom</artifactId> + <artifactId>hornetq-rar-pom</artifactId> <version>2.2.3-SNAPSHOT</version> </parent> Property changes on: trunk/hornetq-ra/hornetq-ra-rar ___________________________________________________________________ Added: svn:ignore + target Modified: trunk/hornetq-ra/hornetq-ra-rar/pom.xml =================================================================== --- trunk/hornetq-ra/hornetq-ra-rar/pom.xml 2011-04-13 20:59:23 UTC (rev 10503) +++ trunk/hornetq-ra/hornetq-ra-rar/pom.xml 2011-04-13 22:39:12 UTC (rev 10504) @@ -4,7 +4,7 @@ <parent> <groupId>org.hornetq</groupId> - <artifactId>hornetq-pom</artifactId> + <artifactId>hornetq-rar-pom</artifactId> <version>2.2.3-SNAPSHOT</version> </parent>

13 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r10503 - branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2011-04-13 16:59:23 -0400 (Wed, 13 Apr 2011) New Revision: 10503 Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java Log: just a tweak Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java 2011-04-13 20:57:56 UTC (rev 10502) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/util/UnitTestCase.java 2011-04-13 20:59:23 UTC (rev 10503) @@ -791,11 +791,11 @@ /** It validates a Bean (POJO) using simple setters and getters with random values. * You can pass a list of properties to be ignored, as some properties will have a pre-defined domain (not being possible to use random-values on them) */ - protected void validateGettersAndSetters(final Object pojo, final String... IgnoredProperties) throws Exception + protected void validateGettersAndSetters(final Object pojo, final String... ignoredProperties) throws Exception { HashSet<String> ignoreSet = new HashSet<String>(); - for (String ignore : IgnoredProperties) + for (String ignore : ignoredProperties) { ignoreSet.add(ignore); }

13 years, 2 months

1
0
0 / 0

JBoss hornetq SVN: r10502 - branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/ra.

by do-not-reply＠jboss.org

Author: clebert.suconic(a)jboss.com Date: 2011-04-13 16:57:56 -0400 (Wed, 13 Apr 2011) New Revision: 10502 Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java Log: fixing testcase Modified: branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java =================================================================== --- branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2011-04-13 18:00:12 UTC (rev 10501) +++ branches/Branch_2_2_EAP/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2011-04-13 20:57:56 UTC (rev 10502) @@ -78,8 +78,7 @@ ra.setConnectorClassName(InVMConnector.class.getName()); HornetQConnectionFactory factory = ra.getDefaultHornetQConnectionFactory(); Assert.assertEquals(factory.getCallTimeout(), HornetQClient.DEFAULT_CALL_TIMEOUT); - Assert.assertEquals(factory.getClientFailureCheckPeriod(), - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); + Assert.assertEquals(factory.getClientFailureCheckPeriod(), HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); Assert.assertEquals(factory.getClientID(), null); Assert.assertEquals(factory.getConnectionLoadBalancingPolicyClassName(), HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME); @@ -89,21 +88,17 @@ Assert.assertEquals(factory.getDupsOKBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE); Assert.assertEquals(factory.getMinLargeMessageSize(), HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); Assert.assertEquals(factory.getProducerMaxRate(), HornetQClient.DEFAULT_PRODUCER_MAX_RATE); - Assert.assertEquals(factory.getConfirmationWindowSize(), - HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE); + Assert.assertEquals(factory.getConfirmationWindowSize(), HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE); // by default, reconnect attempts is set to -1 Assert.assertEquals(-1, factory.getReconnectAttempts()); Assert.assertEquals(factory.getRetryInterval(), HornetQClient.DEFAULT_RETRY_INTERVAL); - Assert.assertEquals(factory.getRetryIntervalMultiplier(), - HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER); - Assert.assertEquals(factory.getScheduledThreadPoolMaxSize(), - HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); + Assert.assertEquals(factory.getRetryIntervalMultiplier(), HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER); + Assert.assertEquals(factory.getScheduledThreadPoolMaxSize(), HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); Assert.assertEquals(factory.getThreadPoolMaxSize(), HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE); Assert.assertEquals(factory.getTransactionBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE); Assert.assertEquals(factory.isAutoGroup(), HornetQClient.DEFAULT_AUTO_GROUP); Assert.assertEquals(factory.isBlockOnAcknowledge(), HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - Assert.assertEquals(factory.isBlockOnNonDurableSend(), - HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnNonDurableSend(), HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); Assert.assertEquals(factory.isBlockOnDurableSend(), HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isPreAcknowledge(), HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); Assert.assertEquals(factory.isUseGlobalPools(), HornetQClient.DEFAULT_USE_GLOBAL_POOLS); @@ -124,8 +119,7 @@ ra.setConnectorClassName(InVMConnector.class.getName()); HornetQConnectionFactory factory = ra.createHornetQConnectionFactory(new ConnectionFactoryProperties()); Assert.assertEquals(factory.getCallTimeout(), HornetQClient.DEFAULT_CALL_TIMEOUT); - Assert.assertEquals(factory.getClientFailureCheckPeriod(), - HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); + Assert.assertEquals(factory.getClientFailureCheckPeriod(), HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); Assert.assertEquals(factory.getClientID(), null); Assert.assertEquals(factory.getConnectionLoadBalancingPolicyClassName(), HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME); @@ -135,21 +129,17 @@ Assert.assertEquals(factory.getDupsOKBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE); Assert.assertEquals(factory.getMinLargeMessageSize(), HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); Assert.assertEquals(factory.getProducerMaxRate(), HornetQClient.DEFAULT_PRODUCER_MAX_RATE); - Assert.assertEquals(factory.getConfirmationWindowSize(), - HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE); + Assert.assertEquals(factory.getConfirmationWindowSize(), HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE); // by default, reconnect attempts is set to -1 Assert.assertEquals(-1, factory.getReconnectAttempts()); Assert.assertEquals(factory.getRetryInterval(), HornetQClient.DEFAULT_RETRY_INTERVAL); - Assert.assertEquals(factory.getRetryIntervalMultiplier(), - HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER); - Assert.assertEquals(factory.getScheduledThreadPoolMaxSize(), - HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); + Assert.assertEquals(factory.getRetryIntervalMultiplier(), HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER); + Assert.assertEquals(factory.getScheduledThreadPoolMaxSize(), HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); Assert.assertEquals(factory.getThreadPoolMaxSize(), HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE); Assert.assertEquals(factory.getTransactionBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE); Assert.assertEquals(factory.isAutoGroup(), HornetQClient.DEFAULT_AUTO_GROUP); Assert.assertEquals(factory.isBlockOnAcknowledge(), HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - Assert.assertEquals(factory.isBlockOnNonDurableSend(), - HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnNonDurableSend(), HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); Assert.assertEquals(factory.isBlockOnDurableSend(), HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isPreAcknowledge(), HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); Assert.assertEquals(factory.isUseGlobalPools(), HornetQClient.DEFAULT_USE_GLOBAL_POOLS); @@ -204,8 +194,7 @@ Assert.assertEquals(factory.getTransactionBatchSize(), 18); Assert.assertEquals(factory.isAutoGroup(), !HornetQClient.DEFAULT_AUTO_GROUP); Assert.assertEquals(factory.isBlockOnAcknowledge(), !HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - Assert.assertEquals(factory.isBlockOnNonDurableSend(), - !HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnNonDurableSend(), !HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); Assert.assertEquals(factory.isBlockOnDurableSend(), !HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isPreAcknowledge(), !HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); Assert.assertEquals(factory.isUseGlobalPools(), !HornetQClient.DEFAULT_USE_GLOBAL_POOLS); @@ -261,8 +250,7 @@ Assert.assertEquals(factory.getTransactionBatchSize(), 18); Assert.assertEquals(factory.isAutoGroup(), !HornetQClient.DEFAULT_AUTO_GROUP); Assert.assertEquals(factory.isBlockOnAcknowledge(), !HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - Assert.assertEquals(factory.isBlockOnNonDurableSend(), - !HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnNonDurableSend(), !HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); Assert.assertEquals(factory.isBlockOnDurableSend(), !HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isPreAcknowledge(), !HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); Assert.assertEquals(factory.isUseGlobalPools(), !HornetQClient.DEFAULT_USE_GLOBAL_POOLS); @@ -409,15 +397,20 @@ public void testValidateProperties() throws Exception { - validateGettersAndSetters(new HornetQResourceAdapter(), "backupTransportConfiguration", "connectionParameters"); + validateGettersAndSetters(new HornetQResourceAdapter(), + "backupTransportConfiguration", + "connectionParameters", + "jndiParams"); validateGettersAndSetters(new HornetQRAManagedConnectionFactory(), "connectionParameters", "sessionDefaultType", - "backupConnectionParameters"); + "backupConnectionParameters", + "jndiParams"); validateGettersAndSetters(new HornetQActivationSpec(), "connectionParameters", "acknowledgeMode", - "subscriptionDurability"); + "subscriptionDurability", + "jndiParams"); HornetQActivationSpec spec = new HornetQActivationSpec(); @@ -463,7 +456,7 @@ ServerLocator locator = createInVMNonHALocator(); ClientSessionFactory factory = locator.createSessionFactory(); ClientSession session = factory.createSession(false, false, false); - HornetQDestination queue = (HornetQDestination) HornetQJMSClient.createQueue("test"); + HornetQDestination queue = (HornetQDestination)HornetQJMSClient.createQueue("test"); session.createQueue(queue.getSimpleAddress(), queue.getSimpleAddress(), true); session.close(); @@ -497,7 +490,7 @@ activation.start(); activation.stop(); - + ra.stop(); locator.close();

13 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits April 2011