Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: infinispan/infinispan
...
head fork: oranheim/infinispan
compare: 4.0.0.BETA1
  • 4 commits
  • 12 files changed
  • 0 commit comments
  • 1 contributor
View
12 cachestore/bdbje/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -35,7 +33,7 @@
<version>3.3.75</version>
</dependency>
- <!-- used to serialize non-serializable objects for a dummy marshaller -->
+
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
@@ -52,4 +50,4 @@
</repository>
</repositories>
-</project>
+</project>
View
12 cachestore/jdbc/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
@@ -54,7 +52,7 @@
<scope>test</scope>
</dependency>
- <!-- used to serialize non-serializable objects for a dummy marshaller -->
+
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
@@ -62,4 +60,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
View
14 cachestore/jdbm/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.infinispan</groupId>
@@ -32,7 +30,7 @@
</dependency>
<dependency>
- <!-- Contains fixes not officially released by JDBM group -->
+
<groupId>org.apache.directory.server</groupId>
<artifactId>apacheds-jdbm</artifactId>
<version>1.5.4</version>
@@ -48,7 +46,7 @@
</exclusions>
</dependency>
- <!-- used to serialize non-serializable objects for a dummy marshaller -->
+
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
@@ -60,4 +58,4 @@
<build>
</build>
-</project>
+</project>
View
16 cachestore/s3/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
<groupId>org.infinispan</groupId>
@@ -15,8 +13,8 @@
<description>Infinispan Amazon S3 CacheStore module</description>
<properties>
- <jclouds.aws.accesskeyid></jclouds.aws.accesskeyid>
- <jclouds.aws.secretaccesskey></jclouds.aws.secretaccesskey>
+ <jclouds.aws.accesskeyid />
+ <jclouds.aws.secretaccesskey />
<version.jclouds>1.0-beta-2</version.jclouds>
<version.log4j>1.2.14</version.log4j>
<version.commons.io>1.4</version.commons.io>
@@ -63,7 +61,7 @@
<scope>test</scope>
</dependency>
- <!-- used to serialize non-serializable objects for a dummy marshaller -->
+
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
@@ -109,4 +107,4 @@
</plugins>
</build>
-</project>
+</project>
View
25 core/pom.xml
@@ -1,13 +1,11 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -33,10 +31,7 @@
<version>${version.jgroups}</version>
</dependency>
- <!--
- For the JTA 1.1 API; consuming projects can safely
- exclude this and replace with any valid source of this API, such as a Java EE app server.
- -->
+
<dependency>
<groupId>org.jboss.javaee</groupId>
<artifactId>jboss-transaction-api</artifactId>
@@ -49,7 +44,7 @@
<version>${version.jboss.common.core}</version>
</dependency>
- <!-- needed by JBoss Common Core -->
+
<dependency>
<groupId>org.jboss.logging</groupId>
<artifactId>jboss-logging-spi</artifactId>
@@ -75,7 +70,7 @@
<optional>true</optional>
</dependency>
- <!-- used to serialize non-serializable objects for a dummy marshaller -->
+
<dependency>
<groupId>xstream</groupId>
<artifactId>xstream</artifactId>
@@ -85,11 +80,7 @@
</dependencies>
<build>
<plugins>
- <!--
- Generates XML schema for Infinispan configuration files
- Run with mvn exec:java
- For more details see:
- http://mojo.codehaus.org/exec-maven-plugin/usage.html -->
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
@@ -111,4 +102,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
4 core/src/main/java/org/infinispan/Version.java
@@ -31,10 +31,10 @@
*/
@Immutable
public class Version {
- public static final String version = "4.0.0.SNAPSHOT";
+ public static final String version = "4.0.0.BETA1";
public static final String codename = "Starobrno";
public static final String projectName = "Infinispan";
- static final byte[] version_id = {'0', '4', '0', '0', 'S'};
+ static final byte[] version_id = {'4', '0', '0', 'B', 'E', 'T', 'A', '1'};
private static final int MAJOR_SHIFT = 11;
private static final int MINOR_SHIFT = 6;
private static final int MAJOR_MASK = 0x00f800;
View
12 gui-demo/pom.xml
@@ -1,19 +1,17 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-gui-demo</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<name>Infinispan GUI Demo</name>
<description>Infinispan - GUI Demo</description>
<dependencies>
@@ -54,4 +52,4 @@
</plugin>
</plugins>
</build>
-</project>
+</project>
View
41 jopr-plugin/pom.xml
@@ -1,15 +1,12 @@
-<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"
- >
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -18,7 +15,7 @@
<packaging>jar</packaging>
<name>Infinispan JOPR Plugin</name>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<description>The Infinispan JOPR Plugin</description>
<properties>
@@ -96,11 +93,10 @@
<phase>compile</phase>
<configuration>
<tasks>
- <mkdir dir="${rhq.deploymentDir}"/>
- <property name="deployment.file"
- location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <mkdir dir="${rhq.deploymentDir}" />
+ <property location="${rhq.deploymentDir}/${project.build.finalName}.jar" name="deployment.file" />
<echo>*** Updating ${deployment.file}...</echo>
- <jar destfile="${deployment.file}" basedir="${project.build.outputDirectory}"/>
+ <jar basedir="${project.build.outputDirectory}" destfile="${deployment.file}" />
</tasks>
</configuration>
<goals>
@@ -113,18 +109,14 @@
<phase>package</phase>
<configuration>
<tasks>
- <property name="deployment.file"
- location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <property location="${rhq.deploymentDir}/${project.build.finalName}.jar" name="deployment.file" />
<echo>*** Updating META-INF dir in ${deployment.file}...</echo>
- <unjar src="${project.build.directory}/${project.build.finalName}.jar"
- dest="${project.build.outputDirectory}">
+ <unjar dest="${project.build.outputDirectory}" src="${project.build.directory}/${project.build.finalName}.jar">
<patternset>
- <include name="META-INF/**"/>
+ <include name="META-INF/**" />
</patternset>
</unjar>
- <jar destfile="${deployment.file}"
- manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF"
- update="true">
+ <jar destfile="${deployment.file}" manifest="${project.build.outputDirectory}/META-INF/MANIFEST.MF" update="true">
</jar>
</tasks>
</configuration>
@@ -138,10 +130,9 @@
<phase>clean</phase>
<configuration>
<tasks>
- <property name="deployment.file"
- location="${rhq.deploymentDir}/${project.build.finalName}.jar"/>
+ <property location="${rhq.deploymentDir}/${project.build.finalName}.jar" name="deployment.file" />
<echo>*** Deleting ${deployment.file}...</echo>
- <delete file="${deployment.file}"/>
+ <delete file="${deployment.file}" />
</tasks>
</configuration>
<goals>
@@ -209,7 +200,7 @@
<scope>provided</scope>
</dependency>
- <!-- TODO: This is beyond horrible. Surely we don't need these dependencies!! -->
+
<dependency>
<groupId>org.hibernate</groupId>
@@ -232,7 +223,7 @@
<scope>provided</scope>
</dependency>
- <!-- END unnenessary deps -->
+
<dependency>
<groupId>${project-package}</groupId>
@@ -248,4 +239,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>
View
165 parent/pom.xml
@@ -1,10 +1,9 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<name>Infinispan Common Parent</name>
<description>Infinispan common parent POM module</description>
<url>http://www.infinispan.org</url>
@@ -65,7 +64,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project-package>org.infinispan</project-package>
- <project-version>4.0.0-SNAPSHOT</project-version>
+ <project-version>4.0.0.BETA1</project-version>
<defaultTestGroup>functional,unit</defaultTestGroup>
</properties>
@@ -76,7 +75,7 @@
<version>1.0</version>
<optional>true</optional>
</dependency>
- <!-- 5.8 is needed for proper parallel test execution -->
+
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
@@ -134,7 +133,7 @@
<build>
<plugins>
- <!-- enforce java 1.5 and maven 2.1.0 -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -157,7 +156,7 @@
</execution>
</executions>
</plugin>
- <!-- by default, compile to JDK 1.5 compatibility (individual modules and/or user can override) -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
@@ -166,7 +165,7 @@
<target>1.5</target>
</configuration>
</plugin>
- <!-- ensure parallel test execution -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
@@ -202,7 +201,7 @@
</properties>
</configuration>
</plugin>
- <!-- eclipse project file generation -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-eclipse-plugin</artifactId>
@@ -211,7 +210,7 @@
<buildOutputDirectory>${basedir}/eclipse-output</buildOutputDirectory>
</configuration>
</plugin>
- <!-- IntelliJ project file generation -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-idea-plugin</artifactId>
@@ -219,7 +218,7 @@
<downloadSources>true</downloadSources>
</configuration>
</plugin>
- <!-- Make sure we generate src jars too -->
+
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
@@ -234,72 +233,72 @@
</executions>
</plugin>
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-javadoc-plugin</artifactId>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>javadoc</id>-->
- <!--<phase>package</phase>-->
- <!--<goals>-->
- <!--<goal>jar</goal>-->
- <!--</goals>-->
- <!--<configuration>-->
- <!--<quiet>true</quiet>-->
- <!--<links>-->
- <!--<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>-->
- <!--<link>http://java.sun.com/javaee/5/docs/api/</link>-->
- <!--</links>-->
- <!--<footer><![CDATA[-->
- <!--Google Analytics -->
- <!--<script type='text/javascript'>-->
- <!--var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");-->
- <!--document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));-->
- <!--</script>-->
- <!--<script type='text/javascript'>-->
- <!--try {-->
- <!--var pageTracker = _gat._getTracker("UA-8601422-4");-->
- <!--pageTracker._trackPageview();-->
- <!--} catch(err) {}</script>-->
- <!--]]></footer>-->
- <!--</configuration>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- <!--<plugin>-->
- <!--<groupId>org.apache.maven.plugins</groupId>-->
- <!--<artifactId>maven-javadoc-plugin</artifactId>-->
- <!--<configuration>-->
- <!--<doclet>org.infinispan.tools.doclet.jmx.JmxDoclet</doclet>-->
- <!--<docletArtifact>-->
- <!--<groupId>org.infinispan</groupId>-->
- <!--<artifactId>infinispan-tools</artifactId>-->
- <!--<version>4.0.0-SNAPSHOT</version>-->
- <!--</docletArtifact>-->
- <!--<footer><![CDATA[-->
- <!--Google Analytics -->
- <!--<script type='text/javascript'>-->
- <!--var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");-->
- <!--document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));-->
- <!--</script>-->
- <!--<script type='text/javascript'>-->
- <!--try {-->
- <!--var pageTracker = _gat._getTracker("UA-8601422-4");-->
- <!--pageTracker._trackPageview();-->
- <!--} catch(err) {}</script>-->
- <!--]]></footer>-->
- <!--</configuration>-->
- <!--<executions>-->
- <!--<execution>-->
- <!--<id>javadoc</id>-->
- <!--<phase>package</phase>-->
- <!--<goals>-->
- <!--<goal>jar</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- <!--</plugin>-->
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
<plugin>
@@ -345,7 +344,7 @@
<artifactId>maven-surefire-report-plugin</artifactId>
<version>2.3</version>
</plugin>
- <!-- Findbugs report -->
+
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>findbugs-maven-plugin</artifactId>
@@ -360,7 +359,7 @@
</reporting>
<repositories>
- <!-- basic JBoss repository -->
+
<repository>
<id>repository.jboss.org</id>
<url>http://repository.jboss.org/maven2</url>
@@ -392,9 +391,9 @@
<distributionManagement>
<repository>
- <!-- Copy the dist to the local checkout of the JBoss maven2 repo ${maven.repository.root} -->
- <!-- It is anticipated that ${maven.repository.root} be set in user's settings.xml -->
- <!-- TODO : replace this with direct svn access once the svnkit providers are available -->
+
+
+
<id>repository.jboss.org</id>
<url>file://${maven.repository.root}</url>
</repository>
@@ -443,4 +442,4 @@
</properties>
</profile>
</profiles>
-</project>
+</project>
View
83 pom.xml
@@ -1,19 +1,17 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<relativePath>parent/pom.xml</relativePath>
</parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<name>Infinispan Distribution</name>
<description>Builds the complete Infinispan distribution bundles</description>
@@ -56,18 +54,18 @@
<link>http://java.sun.com/j2se/1.5.0/docs/api/</link>
<link>http://java.sun.com/javaee/5/docs/api/</link>
</links>
- <footer><![CDATA[
+ <footer>
Google Analytics
-<script type='text/javascript'>
+&lt;script type='text/javascript'&gt;
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type='text/javascript'>
+&lt;/script&gt;
+&lt;script type='text/javascript'&gt;
try {
var pageTracker = _gat._getTracker("UA-8601422-4");
pageTracker._trackPageview();
-} catch(err) {}</script>
- ]]></footer>
+} catch(err) {}&lt;/script&gt;
+ </footer>
</configuration>
</execution>
</executions>
@@ -86,17 +84,17 @@ pageTracker._trackPageview();
</goals>
<configuration>
<tasks>
- <!-- this is a dependency of single_jar assembly -->
- <mkdir dir="target"/>
+
+ <mkdir dir="target" />
<jar destfile="target/infinispan-all.jar">
- <fileset dir="cachestore/bdbje/target/classes"/>
- <fileset dir="cachestore/jdbc/target/classes"/>
- <fileset dir="cachestore/s3/target/classes"/>
- <fileset dir="cachestore/jdbm/target/classes"/>
- <fileset dir="core/target/classes"/>
- <fileset dir="tree/target/classes"/>
+ <fileset dir="cachestore/bdbje/target/classes" />
+ <fileset dir="cachestore/jdbc/target/classes" />
+ <fileset dir="cachestore/s3/target/classes" />
+ <fileset dir="cachestore/jdbm/target/classes" />
+ <fileset dir="core/target/classes" />
+ <fileset dir="tree/target/classes" />
<manifest>
- <attribute name="Main-Class" value="org.infinispan.Version"/>
+ <attribute name="Main-Class" value="org.infinispan.Version" />
</manifest>
</jar>
</tasks>
@@ -110,14 +108,13 @@ pageTracker._trackPageview();
</goals>
<configuration>
<tasks>
- <property name="file"
- value="${project.build.directory}/distribution/${artifactId}-${project-version}-single_jar.zip"/>
+ <property name="file" value="${project.build.directory}/distribution/${artifactId}-${project-version}-single_jar.zip" />
<zip destfile="${file}.new">
<zipfileset src="${file}">
- <exclude name="**/.ignore/**"/>
+ <exclude name="**/.ignore/**" />
</zipfileset>
</zip>
- <move file="${file}.new" tofile="${file}"/>
+ <move file="${file}.new" tofile="${file}" />
</tasks>
</configuration>
</execution>
@@ -162,7 +159,7 @@ pageTracker._trackPageview();
</build>
</profile>
- <!-- TODO somehow combine this with the 'distribution' profile so all docs are built together -->
+
<profile>
<id>jmxdoc</id>
<activation>
@@ -180,18 +177,18 @@ pageTracker._trackPageview();
<artifactId>infinispan-tools</artifactId>
<version>4.0.0-SNAPSHOT</version>
</docletArtifact>
- <footer><![CDATA[
- <!-- Google Analytics -->
-<script type='text/javascript'>
+ <footer>
+ &lt;!-- Google Analytics --&gt;
+&lt;script type='text/javascript'&gt;
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type='text/javascript'>
+&lt;/script&gt;
+&lt;script type='text/javascript'&gt;
try {
var pageTracker = _gat._getTracker("UA-8601422-4");
pageTracker._trackPageview();
-} catch(err) {}</script>
- ]]></footer>
+} catch(err) {}&lt;/script&gt;
+ </footer>
</configuration>
<executions>
<execution>
@@ -207,7 +204,7 @@ pageTracker._trackPageview();
</build>
</profile>
- <!-- TODO somehow combine this with the 'distribution' profile so all docs are built together -->
+
<profile>
<id>configdoc</id>
<activation>
@@ -225,18 +222,18 @@ pageTracker._trackPageview();
<artifactId>infinispan-tools</artifactId>
<version>4.0.0-SNAPSHOT</version>
</docletArtifact>
- <footer><![CDATA[
- <!-- Google Analytics -->
-<script type='text/javascript'>
+ <footer>
+ &lt;!-- Google Analytics --&gt;
+&lt;script type='text/javascript'&gt;
var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type='text/javascript'>
+&lt;/script&gt;
+&lt;script type='text/javascript'&gt;
try {
var pageTracker = _gat._getTracker("UA-8601422-4");
pageTracker._trackPageview();
-} catch(err) {}</script>
- ]]></footer>
+} catch(err) {}&lt;/script&gt;
+ </footer>
</configuration>
<executions>
<execution>
@@ -261,7 +258,7 @@ pageTracker._trackPageview();
</goals>
<configuration>
<tasks>
- <copy file="tools/src/main/resources/stylesheet2.css" todir="target/site/apidocs"/>
+ <copy file="tools/src/main/resources/stylesheet2.css" todir="target/site/apidocs" />
</tasks>
</configuration>
</execution>
@@ -272,4 +269,4 @@ pageTracker._trackPageview();
</profile>
</profiles>
-</project>
+</project>
View
14 tools/pom.xml
@@ -1,19 +1,17 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-tools</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<name>Infinispan Tools</name>
<description>Infinispan - Tools for project</description>
<dependencies>
@@ -31,7 +29,7 @@
<scope>test</scope>
</dependency>
- <!-- needs to depend on all other modules it is trying to document! -->
+
<dependency>
<groupId>${project-package}</groupId>
<artifactId>infinispan-cachestore-bdbje</artifactId>
@@ -100,4 +98,4 @@
</dependencies>
</profile>
</profiles>
-</project>
+</project>
View
10 tree/pom.xml
@@ -1,12 +1,10 @@
-<?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">
+<?xml version='1.0' encoding='UTF-8'?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.infinispan</groupId>
<artifactId>infinispan-parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>4.0.0.BETA1</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
@@ -29,4 +27,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-</project>
+</project>

No commit comments for this range

Something went wrong with that request. Please try again.