[jbosscache-commits] JBoss Cache SVN: r4587 - in core/trunk: assembly and 5 other directories.

Author: manik.surtani(a)jboss.com Date: 2007-10-10 11:03:42 -0400 (Wed, 10 Oct 2007) New Revision: 4587 Added: core/trunk/src/test/java/org/jboss/cache/demo/ Removed: core/trunk/src/main/java/org/jboss/cache/demo/ core/trunk/src/main/resources/build.xml Modified: core/trunk/assembly/all.xml core/trunk/assembly/bin.xml core/trunk/pom.xml core/trunk/src/main/release/README.txt core/trunk/src/test/java/org/jboss/cache/demo/CacheModelDelegate.java core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheView.java Log: Updated assembly artifacts, README, ant script for 'all' distro and moved demo classes from main srcs to test srcs. Modified: core/trunk/assembly/all.xml =================================================================== --- core/trunk/assembly/all.xml 2007-10-10 14:40:10 UTC (rev 4586) +++ core/trunk/assembly/all.xml 2007-10-10 15:03:42 UTC (rev 4587) @@ -1,74 +1,84 @@ <assembly> - <id>all</id> + <id>all</id> - <formats> - <format>zip</format> - </formats> + <formats> + <format>zip</format> + </formats> - <includeBaseDirectory>true</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> - <fileSets> + <fileSets> - <!-- code --> - <fileSet> - <directory>target</directory> - <outputDirectory/> - <includes> - <include>*.jar</include> - </includes> - </fileSet> + <!-- code --> + <fileSet> + <directory>target</directory> + <outputDirectory/> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*test*.jar</exclude> + </excludes> + </fileSet> - <!-- resources --> - <fileSet> - <directory>src/main/resources</directory> - <outputDirectory>etc</outputDirectory> - </fileSet> + <!-- resources --> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>etc</outputDirectory> + </fileSet> - <!-- srcs --> - <fileSet> - <directory>src/main/java</directory> - <outputDirectory>src</outputDirectory> - </fileSet> + <!-- srcs --> + <fileSet> + <directory>src/main/java</directory> + <outputDirectory>src</outputDirectory> + </fileSet> - <!-- tests --> - <fileSet> - <directory>src/test/java</directory> - <outputDirectory>test</outputDirectory> - </fileSet> + <!-- tests --> + <fileSet> + <directory>src/test/java</directory> + <outputDirectory>test</outputDirectory> + </fileSet> - <!-- test resources --> - <fileSet> - <directory>src/test/resources</directory> - <outputDirectory>test</outputDirectory> - </fileSet> + <!-- test resources --> + <fileSet> + <directory>src/test/resources</directory> + <outputDirectory>test</outputDirectory> + </fileSet> - <!-- EULAs and license files --> - <fileSet> - <directory>src/main/release</directory> - <outputDirectory/> - <includes> - <include>**/*.txt</include> - </includes> - </fileSet> + <!-- EULAs and license files --> + <fileSet> + <directory>src/main/release</directory> + <outputDirectory/> + <includes> + <include>**/*.txt</include> + <include>**/*.xml</include> + </includes> + </fileSet> - <!-- docs --> - <fileSet> - <directory>target/site/apidocs</directory> - <outputDirectory>doc/apidocs</outputDirectory> - </fileSet> + <!-- docs --> + <fileSet> + <directory>target/site/apidocs</directory> + <outputDirectory>doc/apidocs</outputDirectory> + </fileSet> - <fileSet> - <directory>target/docbook</directory> - <outputDirectory>doc/</outputDirectory> - </fileSet> - </fileSets> + <fileSet> + <directory>target/docbook</directory> + <outputDirectory>doc/</outputDirectory> + </fileSet> + </fileSets> - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> - <unpack>false</unpack> - <scope>runtime</scope> - </dependencySet> - </dependencySets> + <!-- Make sure we filter out the junk that jboss-common-core pulls in --> + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${scope}/${artifactId}.${extension}</outputFileNameMapping> + <unpack>false</unpack> + <scope>test</scope> + <excludes> + <exclude>apache-xerces:xml-apis</exclude> + <exclude>apache-httpclient:commons-httpclient</exclude> + <exclude>apache-slide:webdavlib</exclude> + </excludes> + </dependencySet> + </dependencySets> </assembly> Modified: core/trunk/assembly/bin.xml =================================================================== --- core/trunk/assembly/bin.xml 2007-10-10 14:40:10 UTC (rev 4586) +++ core/trunk/assembly/bin.xml 2007-10-10 15:03:42 UTC (rev 4587) @@ -1,46 +1,55 @@ <assembly> - <id>bin</id> + <id>bin</id> - <formats> - <format>zip</format> - </formats> + <formats> + <format>zip</format> + </formats> - <includeBaseDirectory>true</includeBaseDirectory> + <includeBaseDirectory>true</includeBaseDirectory> - <fileSets> - <!-- code --> - <fileSet> - <directory>target</directory> - <outputDirectory/> - <includes> - <include>*.jar</include> - </includes> - </fileSet> + <fileSets> + <!-- code --> + <fileSet> + <directory>target</directory> + <outputDirectory/> + <includes> + <include>*.jar</include> + </includes> + <excludes> + <exclude>*test*.jar</exclude> + </excludes> + </fileSet> - <!-- resources --> - <fileSet> - <directory>src/main/resources</directory> - <outputDirectory>etc</outputDirectory> - </fileSet> + <!-- resources --> + <fileSet> + <directory>src/main/resources</directory> + <outputDirectory>etc</outputDirectory> + </fileSet> - <!-- EULAs and license files --> - <fileSet> - <directory>src/main/release</directory> - <outputDirectory/> - <includes> - <include>**/*.txt</include> - </includes> - </fileSet> + <!-- EULAs and license files --> + <fileSet> + <directory>src/main/release</directory> + <outputDirectory/> + <includes> + <include>**/*.txt</include> + </includes> + </fileSet> - </fileSets> + </fileSets> - <dependencySets> - <dependencySet> - <outputDirectory>lib</outputDirectory> - <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> - <unpack>false</unpack> - <scope>runtime</scope> - </dependencySet> - </dependencySets> + <!-- Make sure we filter out the junk that jboss-common-core pulls in --> + <dependencySets> + <dependencySet> + <outputDirectory>lib</outputDirectory> + <outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping> + <unpack>false</unpack> + <scope>runtime</scope> + <excludes> + <exclude>apache-xerces:xml-apis</exclude> + <exclude>apache-httpclient:commons-httpclient</exclude> + <exclude>apache-slide:webdavlib</exclude> + </excludes> + </dependencySet> + </dependencySets> </assembly> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2007-10-10 14:40:10 UTC (rev 4586) +++ core/trunk/pom.xml 2007-10-10 15:03:42 UTC (rev 4587) @@ -1,271 +1,278 @@ <?xml version="1.0"?> <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/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <properties> - <jbosscache-core-version>2.1.0-SNAPSHOT</jbosscache-core-version> - </properties> - <parent> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-common-parent</artifactId> - <version>1.1-SNAPSHOT</version> - </parent> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-core</artifactId> - <version>${jbosscache-core-version}</version> - <name>JBoss Cache - Core Edition</name> - <description>JBoss Cache - Core Edition</description> - <packaging>jar</packaging> - <dependencies> - <dependency> - <groupId>jgroups</groupId> - <artifactId>jgroups</artifactId> - <version>2.6.0.Beta1</version> - </dependency> - <dependency> - <groupId>jdbm</groupId> - <artifactId>jdbm</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>c3p0</groupId> - <artifactId>c3p0</artifactId> - <version>0.9.1.1</version> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>sleepycat</groupId> - <artifactId>je</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>net.jcip</groupId> - <artifactId>jcip-annotations</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>beanshell</groupId> - <artifactId>bsh</artifactId> - <version>2.0b4</version> - </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-javaee</artifactId> - <version>5.0.0.Beta3</version> - </dependency> + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + <properties> + <jbosscache-core-version>2.1.0.BETA1</jbosscache-core-version> + </properties> + <parent> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-common-parent</artifactId> + <version>1.1-SNAPSHOT</version> + </parent> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-core</artifactId> + <version>${jbosscache-core-version}</version> + <name>JBoss Cache - Core Edition</name> + <description>JBoss Cache - Core Edition</description> + <packaging>jar</packaging> + <dependencies> + <dependency> + <groupId>jgroups</groupId> + <artifactId>jgroups</artifactId> + <version>2.6.0.Beta1</version> + </dependency> + <dependency> + <groupId>jdbm</groupId> + <artifactId>jdbm</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>c3p0</groupId> + <artifactId>c3p0</artifactId> + <version>0.9.1.1</version> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>sleepycat</groupId> + <artifactId>je</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>net.jcip</groupId> + <artifactId>jcip-annotations</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-javaee</artifactId> + <version>5.0.0.Beta3</version> + </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jboss-common-core</artifactId> - <version>2.2.1.GA</version> - </dependency> - <!-- test dependencies --> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.3</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.jboss.transaction</groupId> - <artifactId>jboss-jta</artifactId> - <version>4.2.3.SP5</version> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <version>2.2-beta-1</version> - <executions> - <execution> - <id>assemble</id> - <phase>install</phase> - <goals> - <goal>attached</goal> - </goals> - <configuration> - <descriptors> - <descriptor>assembly/bin.xml</descriptor> - <descriptor>assembly/doc.xml</descriptor> - <descriptor>assembly/all.xml</descriptor> - </descriptors> - <finalName>${artifactId}-${jbosscache-core-version}</finalName> - <outputDirectory>target/distribution</outputDirectory> - <workDirectory>target/assembly/work</workDirectory> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>test-jar</goal> - </goals> - </execution> - </executions> - </plugin> - <!-- the docbook generation plugin for the user guide --> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <version>2.0.0</version> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.jboss.cache</groupId> - <artifactId>jbosscache-doc-xslt-support</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - <executions> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <version>2.2.1.GA</version> + </dependency> + <!-- test dependencies --> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.3</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.jboss.transaction</groupId> + <artifactId>jboss-jta</artifactId> + <version>4.2.3.SP5</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>beanshell</groupId> + <artifactId>bsh</artifactId> + <version>2.0b4</version> + <scope>test</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <version>2.2-beta-1</version> + <executions> + <execution> + <id>assemble</id> + <phase>install</phase> + <goals> + <goal>attached</goal> + </goals> + <configuration> + <descriptors> + <descriptor>assembly/bin.xml</descriptor> + <descriptor>assembly/doc.xml</descriptor> + <descriptor>assembly/all.xml</descriptor> + </descriptors> + <finalName>${artifactId}-${jbosscache-core-version}</finalName> + <outputDirectory>target/distribution</outputDirectory> + <workDirectory>target/assembly/work</workDirectory> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>test-jar</goal> + </goals> + </execution> + </executions> + </plugin> + <!-- the docbook generation plugin for the user guide --> + <plugin> + <groupId>org.jboss.maven.plugins</groupId> + <artifactId>maven-jdocbook-plugin</artifactId> + <version>2.0.0</version> + <extensions>true</extensions> + <dependencies> + <dependency> + <groupId>org.jboss.cache</groupId> + <artifactId>jbosscache-doc-xslt-support</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + <executions> - <!-- The User Guide--> - <execution> - <id>userguide_en</id> - <phase>package</phase> - <goals> - <goal>resources</goal> - <goal>generate</goal> - </goals> - <configuration> - <sourceDocumentName>master.xml</sourceDocumentName> - <sourceDirectory>${basedir}/src/main/docbook/userguide/en</sourceDirectory> - <imageResource> - <directory>${basedir}/src/main/docbook/images</directory> - </imageResource> - <cssResource> - <directory>${basedir}/src/main/docbook/css</directory> - </cssResource> - <targetDirectory>${basedir}/target/docbook/userguide_en</targetDirectory> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource> - <finalName>userguide_en.pdf</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>false</xincludeSupported> - </options> - </configuration> - </execution> + <!-- The User Guide--> + <execution> + <id>userguide_en</id> + <phase>package</phase> + <goals> + <goal>resources</goal> + <goal>generate</goal> + </goals> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${basedir}/src/main/docbook/userguide/en</sourceDirectory> + <imageResource> + <directory>${basedir}/src/main/docbook/images</directory> + </imageResource> + <cssResource> + <directory>${basedir}/src/main/docbook/css</directory> + </cssResource> + <targetDirectory>${basedir}/target/docbook/userguide_en</targetDirectory> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource> + <finalName>userguide_en.pdf</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>false</xincludeSupported> + </options> + </configuration> + </execution> - <!-- The Tutorial --> - <execution> - <id>tutorial_en</id> - <phase>package</phase> - <goals> - <goal>resources</goal> - <goal>generate</goal> - </goals> - <configuration> - <sourceDocumentName>master.xml</sourceDocumentName> - <sourceDirectory>${basedir}/src/main/docbook/tutorial/en</sourceDirectory> - <imageResource> - <directory>${basedir}/src/main/docbook/images</directory> - </imageResource> - <cssResource> - <directory>${basedir}/src/main/docbook/css</directory> - </cssResource> - <targetDirectory>${basedir}/target/docbook/tutorial_en</targetDirectory> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource> - <finalName>tutorial_en.pdf</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>false</xincludeSupported> - </options> - </configuration> - </execution> + <!-- The Tutorial --> + <execution> + <id>tutorial_en</id> + <phase>package</phase> + <goals> + <goal>resources</goal> + <goal>generate</goal> + </goals> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${basedir}/src/main/docbook/tutorial/en</sourceDirectory> + <imageResource> + <directory>${basedir}/src/main/docbook/images</directory> + </imageResource> + <cssResource> + <directory>${basedir}/src/main/docbook/css</directory> + </cssResource> + <targetDirectory>${basedir}/target/docbook/tutorial_en</targetDirectory> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource> + <finalName>tutorial_en.pdf</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>false</xincludeSupported> + </options> + </configuration> + </execution> - <!-- the FAQs --> - <execution> - <id>faq_en</id> - <phase>package</phase> - <goals> - <goal>resources</goal> - <goal>generate</goal> - </goals> - <configuration> - <sourceDocumentName>master.xml</sourceDocumentName> - <sourceDirectory>${basedir}/src/main/docbook/faq/en</sourceDirectory> - <imageResource> - <directory>${basedir}/src/main/docbook/images</directory> - </imageResource> - <cssResource> - <directory>${basedir}/src/main/docbook/css</directory> - </cssResource> - <targetDirectory>${basedir}/target/docbook/faq_en</targetDirectory> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource> - <finalName>faq_en.pdf</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>false</xincludeSupported> - </options> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> + <!-- the FAQs --> + <execution> + <id>faq_en</id> + <phase>package</phase> + <goals> + <goal>resources</goal> + <goal>generate</goal> + </goals> + <configuration> + <sourceDocumentName>master.xml</sourceDocumentName> + <sourceDirectory>${basedir}/src/main/docbook/faq/en</sourceDirectory> + <imageResource> + <directory>${basedir}/src/main/docbook/images</directory> + </imageResource> + <cssResource> + <directory>${basedir}/src/main/docbook/css</directory> + </cssResource> + <targetDirectory>${basedir}/target/docbook/faq_en</targetDirectory> + <formats> + <format> + <formatName>pdf</formatName> + <stylesheetResource>classpath:/standard/fopdf.xsl</stylesheetResource> + <finalName>faq_en.pdf</finalName> + </format> + <format> + <formatName>html</formatName> + <stylesheetResource>classpath:/standard/html_chunk.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + <format> + <formatName>html_single</formatName> + <stylesheetResource>classpath:/standard/html.xsl</stylesheetResource> + <finalName>index.html</finalName> + </format> + </formats> + <options> + <xincludeSupported>false</xincludeSupported> + </options> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> - <!-- basic JBoss repository so that the common parent POM in jbosscache-support can be found --> - <repositories> - <repository> - <id>repository.jboss.org</id> - <url>http://repository.jboss.org/maven2</url> - </repository> - <repository> - <id>snapshots.jboss.org</id> - <url>http://snapshots.jboss.org/maven2</url> - </repository> - </repositories> + <!-- basic JBoss repository so that the common parent POM in jbosscache-support can be found --> + <repositories> + <repository> + <id>repository.jboss.org</id> + <url>http://repository.jboss.org/maven2</url> + </repository> + <repository> + <id>snapshots.jboss.org</id> + <url>http://snapshots.jboss.org/maven2</url> + </repository> + </repositories> </project> Modified: core/trunk/src/main/release/README.txt =================================================================== --- core/trunk/src/main/release/README.txt 2007-10-10 14:40:10 UTC (rev 4586) +++ core/trunk/src/main/release/README.txt 2007-10-10 15:03:42 UTC (rev 4587) @@ -16,6 +16,14 @@ Requirements: - JDK 5.0 and up +Running the tutorial: + - The bin and all distros come with a build.xml file in the directory root, which contains targets for running + tests as well as the demo outlined in the tutorial. You need an installation of Jakarta Ant 1.6.0 or higher + to run the script. + +- Just run 'ant' in the root directry for instructions. + + Problems: - Please report problems to the JBoss cache forum (http://www.jboss.org/forum.jsp?forum=157) Deleted: core/trunk/src/main/resources/build.xml =================================================================== --- core/trunk/src/main/resources/build.xml 2007-10-10 14:40:10 UTC (rev 4586) +++ core/trunk/src/main/resources/build.xml 2007-10-10 15:03:42 UTC (rev 4587) @@ -1,412 +0,0 @@ -<?xml version="1.0"?> - -<project name="junit examples" default="help"> - - <property name="build.sysclasspath" value="ignore"/> - <property name="junit.timeout" value="180000"/> - <!-- 3 minutes --> - - <property file="./build.properties"/> - - <!-- Test if JDK5 is available --> - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - - <!-- Test if this is a pojocache-enabled package --> - <available file="examples/PojoCache" property="ALLOW_POJOCACHE"/> - - <!-- set local properties for this build --> - <path id="lib.classpath"> - <fileset dir="${lib}"> - <include name="**/*.jar"/> - </fileset> - </path> - - <!-- Used for aop classloading and aopc --> - <path id="aop.classpath"> - <fileset dir="${lib}"> - <include name="*.jar"/> - <exclude name="jboss-cache.jar"/> - <exclude name="**/j*unit.jar"/> - <!-- exclude name="**/jgroups.jar" /--> - <exclude name="**/bsh*.jar"/> - </fileset> - </path> - - <path id="cache.classpath"> - <fileset dir="${lib}"> - <include name="**/jboss-cache.jar"/> - </fileset> - </path> - - <path id="build.classpath"> - <pathelement path="${build}"/> - </path> - - <target name="help" description="help page"> - <echo message="build.sh &lt;command&gt; where command is:"/> - <echo message=" compile -- compile the examples code"/> - <echo message=" clobber -- clean up the whole directory"/> - <echo message=" run.batch -- run batch examples"/> - <echo message=" one.test -- run one single test case. Need -Dtest=org.jboss.cache.??Test"/> - <echo message=" one.test.pojo -- run one single PojoCache test case. Need -Dtest=org.jboss.cache.pojo.??Test"/> - <echo message=" run.pojocache.batch -- run batch pojocache examples"/> - <echo message=" run.demo -- run demo gui for plain cache"/> - <echo message=" run.demo.pojocache -- run demo gui for pojocache cache"/> - </target> - - <!-- set up directory --> - <target name="init" description="Prepare to build."> - <!-- Create the time stamp --> - <tstamp/> - <!-- Create the build directory structure used by compile -and copy the deployment descriptors into it--> - <mkdir dir="${build}"/> - <mkdir dir="${reports}"/> - </target> - - <target name="clean" description="Clean up compiled classes"> - <delete dir="${output}"/> - </target> - - <target name="clobber" depends="clean"/> - - <target name="pojocache-resources" depends="init" if="ALLOW_POJOCACHE"> - <copy todir="output/resources" filtering="no" overwrite="yes"> - <fileset dir="resources"> - <include name="pojocache-aop.xml"/> - </fileset> - </copy> - - </target> - - <target name="compile" depends="init, pojocache-resources" description="Build unit testing class for JDK50" - if="HAVE_JDK_1.5"> - <javac srcdir="${source}" - destdir="${build}" - debug="true" - deprecation="true"> - <classpath> - <path refid="lib.classpath"/> - </classpath> - </javac> - - <copy todir="${build}"> - <fileset dir="${source}"> - <include name="**/*.clazz"/> - <include name="**/*.notjava"/> - </fileset> - </copy> - - <copy todir="output/etc" filtering="no" overwrite="yes"> - <fileset dir="etc"> - <include name="log4j.xml"/> - <!-- The following copies the cache-jdbc.properties file for - running jdbc cache loader test against different DBMS --> - <include name="cache-jdbc.properties"/> - </fileset> - </copy> - - <copy todir="output/etc/META-INF" filtering="no" overwrite="yes"> - <fileset dir="etc/META-INF"> - <include name="*.xml"/> - </fileset> - </copy> - </target> - - <!-- eg. ant run.examples -Dtest=org.jboss.test.cache.test.local.NoTxUnitTestCase --> - <target name="one.test" depends="compile" description="run one junit test case."> - <junit printsummary="true" fork="yes"> - <classpath refid="lib.classpath"/> - <classpath path="${build}"/> - <classpath path="${output}/etc"/> - <jvmarg value="-Dbind.address=${bind.address}"/> - <jvmarg value="-Djava.net.preferIPv4Stack=true"/> - <formatter type="xml"/> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - <test name="${test}" todir="${reports}"/> - <!-- - <jvmarg value="-Xdebug"/> - <jvmarg value="-Xnoagent"/> - <jvmarg value="-Djava.compiler=NONE"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,server=n,suspend=n,address=localhost:2401"/> - --> - </junit> - - <junitreport todir="${reports}"> - <fileset dir="${reports}"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="${reports}/html"/> - </junitreport> - </target> - - <target name="run.batch" depends="compile" description="run junit test cases."> - <junit printsummary="true" - timeout="${junit.timeout}" - fork="yes"> - <jvmarg value="-Xmx128M"/> - <!-- - <jvmarg value="-Dbind.address=172.16.129.57"/> - --> - <classpath refid="lib.classpath"/> - <jvmarg value="-Dbind.address=${bind.address}"/> - <jvmarg value="-Djava.net.preferIPv4Stack=true"/> - <classpath path="${build}"/> - <classpath path="${output}/etc"/> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - <formatter type="xml"/> - - <batchtest todir="${reports}" - haltonerror="no" - haltonfailure="no" - fork="yes"> - - <fileset dir="${build}"> - <include name="**/*Test.class"/> - <exclude name="**/pojo/**/*Test.class"/> - </fileset> - </batchtest> - - </junit> - - <junitreport todir="${reports}"> - <fileset dir="${reports}"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="${reports}/html"/> - </junitreport> - </target> - - <target name="run.demo" depends="compile" description="run JBoss Cache demo."> - <java classname="org.jboss.cache.demo.JBossCacheView" fork="yes"> - <jvmarg value="-Xmx128M"/> - <sysproperty key="java.net.preferIPv4Stack" value="true"/> - <sysproperty key="bind.address" value="127.0.0.1"/> - <classpath refid="lib.classpath"/> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - <classpath path="${output}/etc"/> - <classpath path="${build}"/> - <arg value="-console"/> - <!-- make sure we use the embedded BeanShell console --> - </java> - </target> - - <target name="run.demo.pojocache" depends="compile" description="run Pojo Cache demo."> - <java classname="org.jboss.cache.pojo.demo.PojoCacheView" fork="yes"> - <jvmarg value="-Xmx128M"/> - <jvmarg value="-javaagent:./lib/jboss-aop-jdk50.jar"/> - <sysproperty key="java.net.preferIPv4Stack" value="true"/> - <sysproperty key="bind.address" value="127.0.0.1"/> - <classpath refid="lib.classpath"/> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - <sysproperty key="jboss.aop.path" value="./resources/pojocache-aop.xml"/> - <classpath path="${output}/etc"/> - <classpath path="${build}"/> - <arg value="-console"/> - <!-- make sure we use the embedded BeanShell console --> - </java> - </target> - - <target name="run.demo.async" depends="compile" description="run JBoss Cache demo."> - <java classname="org.jboss.cache.demo.JBossCacheView" fork="yes"> - <jvmarg value="-Xmx128M"/> - <arg value="-config"/> - <arg value="META-INF/replAsync-service.xml"/> - <classpath refid="lib.classpath"/> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - <classpath path="${output}/etc"/> - <classpath path="${build}"/> - </java> - </target> - - - <target name="run.demo.async.shared.cacheloader" depends="compile" description="run JBoss Cache demo."> - <java classname="org.jboss.cache.demo.JBossCacheView" fork="yes"> - <jvmarg value="-Xmx128M"/> - <arg value="-config"/> - <arg value="META-INF/replAsyncSharedCacheLoader-service.xml"/> - <classpath refid="lib.classpath"/> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - <classpath path="${output}/etc"/> - <classpath path="${build}"/> - </java> - </target> - - - <target name="run.demo.unshared.node1" depends="compile" description="run JBoss Cache demo."> - <java classname="org.jboss.cache.demo.JBossCacheView" fork="yes"> - <jvmarg value="-Xmx128M"/> - <arg value="-config"/> - <arg value="META-INF/node1.xml"/> - <classpath refid="lib.classpath"/> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - <classpath path="${output}/etc"/> - <classpath path="${build}"/> - </java> - </target> - - <target name="run.demo.unshared.node2" depends="compile" description="run JBoss Cache demo."> - <java classname="org.jboss.cache.demo.JBossCacheView" fork="yes"> - <jvmarg value="-Xmx128M"/> - <arg value="-config"/> - <arg value="META-INF/node2.xml"/> - <classpath refid="lib.classpath"/> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - <classpath path="${output}/etc"/> - <classpath path="${build}"/> - </java> - </target> - - <target name="run.server" depends="compile" description="run standalone server replicator."> - <java classname="org.jboss.cache.Server" fork="yes"> - <classpath refid="lib.classpath"/> - <classpath path="${build}"/> - <classpath path="${output}/etc"/> - </java> - </target> - - <!-- +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - PojoCache section - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ --> - - <!-- pre-compile directory with aopc --> - <!-- define ant target for aopc. It pre-compile your Pojo classes with decarlation in a jboss-aop.xml file. - To check whether it is successfully pre-compiled, you can either check for extra class files output or use - a de-compiler like Cavj to examine the new pojo classes. - Note that you direcoty name can't contain white spaces!! - --> - - <target name="aopc" depends="compile" description="Precompile aop class"> - <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="lib.classpath"/> - <aopc compilerclasspathref="aop.classpath" verbose="true"> - <src path="${build}"/> - <include name="org/jboss/cache/pojo/test/**/*.class"/> - <aoppath path="${output}/resources/pojocache-aop.xml"/> - <classpath path="${build}"/> - <classpath refid="lib.classpath"/> - </aopc> - </target> - - <!-- eg. ant run.examples -Dtest=org.jboss.test.cache.test.local.NoTxUnitTestCase --> - <target name="one.test.pojo" depends="compile" description="run one junit test case."> - - <!-- - <junit printsummary="true" fork="yes" > - <classpath refid="lib.classpath" /> - <classpath path="${build}" /> - <jvmarg value="-Djboss.aop.path=${output}/etc/META-INF/jboss-aop.xml"/> - <jvmarg value="-Xbootclasspath/p:${bootclasspath}"/> - <formatter type="xml" /> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - <test name="${test}" todir="${reports}" /> - <jvmarg value="-Xdebug"/> - <jvmarg value="-Xnoagent"/> - <jvmarg value="-Djava.compiler=NONE"/> - <jvmarg value="-Xrunjdwp:transport=dt_socket,server=n,suspend=n,address=localhost:2401"/> - </junit> - --> - - <junit printsummary="yes" timeout="${junit.timeout}" fork="yes"> - <jvmarg value="-Djboss.aop.path=${output}/resources/pojocache-aop.xml"/> - <jvmarg value="-javaagent:${lib}/jboss-aop-jdk50.jar"/> - <jvmarg value="-Dbind.address=${bind.address}"/> - <jvmarg value="-Djava.net.preferIPv4Stack=true"/> - <classpath path="${output}/etc"/> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - <classpath refid="lib.classpath"/> - <classpath path="${build}"/> - <formatter type="xml" usefile="true"/> - <test name="${test}" todir="${reports}"/> - </junit> - - <junitreport todir="${reports}"> - <fileset dir="${reports}"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="${reports}/html"/> - </junitreport> - </target> - - <!-- eg. ant run.examples -Dtest=org.jboss.test.cache.test.local.NoTxUnitTestCase --> - <target name="one.test.pojocache" depends="compile" description="run one junit test case."> - <junit printsummary="yes" timeout="${junit.timeout}" fork="yes"> - <jvmarg value="-Djboss.aop.path=${output}/resources/pojocache-aop.xml"/> - <jvmarg value="-javaagent:${lib}/jboss-aop-jdk50.jar"/> - <jvmarg value="-Dbind.address=${bind.address}"/> - <jvmarg value="-Djava.net.preferIPv4Stack=true"/> - <classpath path="${output}/etc"/> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - <classpath refid="lib.classpath"/> - <classpath refid="build.classpath"/> - <formatter type="xml" usefile="true"/> - <test name="${test}" todir="${reports}"/> - </junit> - - <junitreport todir="${reports}"> - <fileset dir="${reports}"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="${reports}/html"/> - </junitreport> - </target> - - <target name="one.test.pojocache.aopc" depends="aopc" description="run junit test cases."> - <junit printsummary="true" fork="yes"> - <classpath refid="lib.classpath"/> - <classpath refid="build.classpath"/> - <jvmarg value="-Dbind.address=${bind.address}"/> - <jvmarg value="-Djava.net.preferIPv4Stack=true"/> - <jvmarg value="-Djboss.aop.path=${output}/resources/pojocache-aop.xml"/> - <classpath path="${output}/etc"/> - <formatter type="xml"/> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - <test name="${test}" todir="${reports}"/> - <jvmarg value="-Xmx128M"/> - </junit> - - <junitreport todir="${reports}"> - <fileset dir="${reports}"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="${reports}/html"/> - </junitreport> - </target> - - <!-- Works only with aop package --> - <!-- This one uses the aopc+ annoc option --> - <target name="run.pojocache.batch" depends="aopc" description="run junit test cases."> - <junit printsummary="true" - timeout="${junit.timeout}" - fork="yes"> - <jvmarg value="-Xmx128M"/> - <classpath refid="lib.classpath"/> - <jvmarg value="-Djboss.aop.path=${output}/resources/pojocache-aop.xml"/> - <jvmarg value="-Dbind.address=${bind.address}"/> - <jvmarg value="-Djava.net.preferIPv4Stack=true"/> - <classpath refid="build.classpath"/> - <classpath path="${output}/etc"/> - <formatter type="xml"/> - <sysproperty key="log4j.configuration" value="file:${output}/etc/log4j.xml"/> - - <batchtest todir="${reports}" - haltonerror="no" - haltonfailure="no" - fork="yes"> - - <fileset dir="${build}"> - <include name="**/pojo/**/*Test.class"/> - </fileset> - </batchtest> - - </junit> - - <junitreport todir="${reports}"> - <fileset dir="${reports}"> - <include name="TEST-*.xml"/> - </fileset> - <report format="frames" todir="${reports}/html"/> - </junitreport> - </target> - - -</project> Copied: core/trunk/src/test/java/org/jboss/cache/demo (from rev 4584, core/trunk/src/main/java/org/jboss/cache/demo) Modified: core/trunk/src/test/java/org/jboss/cache/demo/CacheModelDelegate.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/demo/CacheModelDelegate.java 2007-10-10 03:22:20 UTC (rev 4584) +++ core/trunk/src/test/java/org/jboss/cache/demo/CacheModelDelegate.java 2007-10-10 15:03:42 UTC (rev 4587) @@ -9,7 +9,7 @@ import org.jboss.cache.Cache; /** - * Delegate that hides cache model details for the demo GUI + * Delegate that hides cache model details for the demo GUI * * @author <a href="mailto:galder.zamarreno@jboss.com">Galder Zamarreno</a> */ Modified: core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/demo/JBossCacheGUI.java 2007-10-10 03:22:20 UTC (rev 4584) +++ core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheGUI.java 2007-10-10 15:03:42 UTC (rev 4587) @@ -206,8 +206,8 @@ catch (TimeoutException te) { String message = "Unable to update GUI due to a timeout trying to acquire lock on a node." + - "This might be due to clicking on a node which is currently locked by an ongoing " + - "transaction: "; + "This might be due to clicking on a node which is currently locked by an ongoing " + + "transaction: "; printAndLogStacktrace(message, te); } catch (Exception e) @@ -246,13 +246,13 @@ { this.cache = this.cacheModelDelegate.getGenericCache(); Runtime.getRuntime().addShutdownHook( - new Thread() - { - public void run() - { - cache.stop(); - } - }); + new Thread() + { + public void run() + { + cache.stop(); + } + }); cache.addCacheListener(this); root = cache.getRoot(); @@ -396,8 +396,8 @@ catch (TimeoutException te) { String message = "Unable to update GUI due to a timeout trying to acquire lock on a node." + - "This might be due to clicking on a node which is currently locked by an ongoing " + - "transaction: "; + "This might be due to clicking on a node which is currently locked by an ongoing " + + "transaction: "; printAndLogStacktrace(message, te); } catch (Exception e) @@ -417,14 +417,14 @@ protected String getWelcomeMessage() { return "Welcome to the BeanShell console.\n\n" + - "This console gives you a direct shell interface to the GUI above and allows you to manipulate the cache directly. " + - "Some of the variables initialised in this shell session are:\n\n" + - "// an instance of org.jboss.cache\n" + - " Cache<String, String> cache;\n" + - "// a reference to the root node\n" + - " Node<String, String> root;\n" + - "// the transaction manager registered with the cache\n" + - " TransactionManager transactionManager;\n"; + "This console gives you a direct shell interface to the GUI above and allows you to manipulate the cache directly. " + + "Some of the variables initialised in this shell session are:\n\n" + + "// an instance of org.jboss.cache\n" + + " Cache<String, String> cache;\n" + + "// a reference to the root node\n" + + " Node<String, String> root;\n" + + "// the transaction manager registered with the cache\n" + + " TransactionManager transactionManager;\n"; } protected void configureInterpreter(Interpreter interpreter, CacheModelDelegate cacheDelegate) throws EvalError @@ -885,18 +885,18 @@ fqnTextField.setText(Fqn.SEPARATOR); } Object[] information = {"Enter fully qualified name", - fqnTextField}; + fqnTextField}; final String btnString1 = "OK"; final String btnString2 = "Cancel"; Object[] options = {btnString1, btnString2}; int userChoice = JOptionPane.showOptionDialog(null, - information, - "Add DataNode", - JOptionPane.YES_NO_OPTION, - JOptionPane.PLAIN_MESSAGE, - null, - options, - options[0]); + information, + "Add DataNode", + JOptionPane.YES_NO_OPTION, + JOptionPane.PLAIN_MESSAGE, + null, + options, + options[0]); if (userChoice == 0) { String userInput = fqnTextField.getText(); @@ -922,18 +922,18 @@ } Object[] information = {"Enter fully qualified name", - fqnTextField}; + fqnTextField}; final String btnString1 = "OK"; final String btnString2 = "Cancel"; Object[] options = {btnString1, btnString2}; int userChoice = JOptionPane.showOptionDialog(null, - information, - "Load DataNode", - JOptionPane.YES_NO_OPTION, - JOptionPane.PLAIN_MESSAGE, - null, - options, - options[0]); + information, + "Load DataNode", + JOptionPane.YES_NO_OPTION, + JOptionPane.PLAIN_MESSAGE, + null, + options, + options[0]); if (userChoice == 0) { String userInput = fqnTextField.getText(); @@ -958,18 +958,18 @@ fqnTextField.setText(Fqn.SEPARATOR); } Object[] information = {"Enter fully qualified name", - fqnTextField}; + fqnTextField}; final String btnString1 = "OK"; final String btnString2 = "Cancel"; Object[] options = {btnString1, btnString2}; int userChoice = JOptionPane.showOptionDialog(null, - information, - "Evict DataNode", - JOptionPane.YES_NO_OPTION, - JOptionPane.PLAIN_MESSAGE, - null, - options, - options[0]); + information, + "Evict DataNode", + JOptionPane.YES_NO_OPTION, + JOptionPane.PLAIN_MESSAGE, + null, + options, + options[0]); if (userChoice == 0) { String userInput = fqnTextField.getText(); Modified: core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheView.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/demo/JBossCacheView.java 2007-10-10 03:22:20 UTC (rev 4584) +++ core/trunk/src/test/java/org/jboss/cache/demo/JBossCacheView.java 2007-10-10 15:03:42 UTC (rev 4587) @@ -32,7 +32,7 @@ public class JBossCacheView { private static Log log = LogFactory.getLog(JBossCacheView.class.getName()); - + /** * A reference to the Swing GUI that displays contents to the user. */ @@ -49,7 +49,7 @@ private String configurationFile = "META-INF/replSync-service.xml"; /** - * The cache model. + * The cache model. */ private CacheModelDelegate cacheModelDelegate; @@ -61,7 +61,7 @@ public String getConfigurationFile() { return configurationFile; - } + } /** * Sets a reference to the cache model @@ -87,7 +87,7 @@ CacheModelDelegate cacheModelDelegate = createCacheDelegate(); startCacheModelDelegate(cacheModelDelegate); setCacheModelDelegate(cacheModelDelegate); - + start(); } @@ -170,7 +170,7 @@ protected CacheModelDelegate createCacheDelegate() throws Exception { CacheFactory<String, String> factory = DefaultCacheFactory.getInstance(); - Cache<String,String> cache = factory.createCache(configurationFile, false); + Cache<String, String> cache = factory.createCache(configurationFile, false); // hack to prevent a state transfer for now cache.getConfiguration().setFetchInMemoryState(false); @@ -184,7 +184,7 @@ * Factory method that creates a cache GUI instance * * @param cacheDelegate cache model instance - * @param useConsole whether to enable the embedded beanshell console + * @param useConsole whether to enable the embedded beanshell console * @return instance of cache GUI * @throws Exception */ @@ -192,7 +192,7 @@ { return new JBossCacheGUI(cacheDelegate, useConsole); } - + /** * Starts the cache model * @@ -201,7 +201,7 @@ private void startCacheModelDelegate(CacheModelDelegate cacheModelDelegate) { cacheModelDelegate.getGenericCache().start(); - } + } private static void help() {