[jboss-cvs] JBossAS SVN: r102696 - in projects/cluster/ha-server-cache-spi/tags: 2.1.0.Final and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Sun Mar 21 21:09:19 EDT 2010
Author: bstansberry at jboss.com
Date: 2010-03-21 21:09:19 -0400 (Sun, 21 Mar 2010)
New Revision: 102696
Added:
projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/
projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/pom.xml
projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TestDistributedCacheManagerFactory.java
projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TestDistributedCacheManagerFactoryFactory.java
Removed:
projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/pom.xml
Log:
[maven-release-plugin] copy for tag 2.1.0.Final
Copied: projects/cluster/ha-server-cache-spi/tags/2.1.0.Final (from rev 102367, projects/cluster/ha-server-cache-spi/trunk)
Deleted: projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/pom.xml
===================================================================
--- projects/cluster/ha-server-cache-spi/trunk/pom.xml 2010-03-12 18:45:09 UTC (rev 102367)
+++ projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/pom.xml 2010-03-22 01:09:19 UTC (rev 102696)
@@ -1,186 +0,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/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-cluster</artifactId>
- <version>2.0.0.GA</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-cache-spi</artifactId>
- <packaging>jar</packaging>
- <version>2.1.0-SNAPSHOT</version>
- <name>JBoss AS - JBoss Cache Integration SPI</name>
- <url>http://www.jboss.org</url>
- <description>SPI for JBoss AS Clustered Caching Services</description>
- <licenses>
- <license>
- <name>lgpl</name>
- <url>http://repository.jboss.com/licenses/lgpl.txt</url>
- </license>
- </licenses>
- <organization>
- <name>JBoss, a division of Red Hat, Inc.</name>
- <url>http://www.jboss.org</url>
- </organization>
-
- <scm>
- <connection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/cluster/ha-server-cache-spi/trunk</connection>
- </scm>
-
- <properties>
- <version.jboss.ha.server.api>1.1.0.GA</version.jboss.ha.server.api>
- <!-- This should be [2.6.2,3.0.0) but maven complains about it -->
- <version.jgroups>2.6.10.GA</version.jgroups>
- <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
- <version.org.jboss.naming>5.0.2.GA</version.org.jboss.naming>
- <version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
- <version.org.jboss.metadata>1.0.0.CR5</version.org.jboss.metadata>
- <version.junit>3.8.1</version.junit>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
- <!-- The tagBase property is needed during the release process so that the maven release plugin
- will create the release tag in the appropriate location. -->
- <tagBase>https://svn.jboss.org/repos/jbossas/projects/cluster/ha-server-cache-spi/tags</tagBase>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
-
- <!-- Global dependencies -->
- <dependency>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-server-api</artifactId>
- <version>${version.jboss.ha.server.api}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss.aop</groupId>
- <artifactId>jboss-aop</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.cluster</groupId>
- <artifactId>jboss-ha-client</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>jgroups</groupId>
- <artifactId>jgroups</artifactId>
- <version>${version.jgroups}</version>
- <exclusions>
- <exclusion>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging-spi</artifactId>
- <version>${version.jboss.logging.spi}</version>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.naming</groupId>
- <artifactId>jnp-client</artifactId>
- <version>${version.org.jboss.naming}</version>
- </dependency>
-
- <dependency>
- <groupId>jboss</groupId>
- <artifactId>jboss-serialization</artifactId>
- <version>${version.jboss.serialization}</version>
- <exclusions>
- <exclusion>
- <groupId>jboss</groupId>
- <artifactId>jboss-logging-log4j</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- <version>${version.org.jboss.metadata}</version>
- <exclusions>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ejb3</groupId>
- <artifactId>jboss-ejb3-ext-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-ejb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-jms-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.hibernate</groupId>
- <artifactId>ejb3-persistence</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.javaee</groupId>
- <artifactId>jboss-transaction-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss.ws</groupId>
- <artifactId>jbossws-spi</artifactId>
- </exclusion>
- <exclusion>
- <groupId>jboss.jbossws</groupId>
- <artifactId>jboss-jaxws</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jbossxb</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-vfs</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.jboss</groupId>
- <artifactId>jboss-mdr</artifactId>
- </exclusion>
- <exclusion>
- <groupId>sun-jaxb</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>apache-xerces</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <!-- Test dependencies -->
- <!--
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${version.junit}</version>
- <scope>test</scope>
- </dependency>
- -->
-
- </dependencies>
-
-</project>
-
Copied: projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/pom.xml (from rev 102695, projects/cluster/ha-server-cache-spi/trunk/pom.xml)
===================================================================
--- projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/pom.xml (rev 0)
+++ projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/pom.xml 2010-03-22 01:09:19 UTC (rev 102696)
@@ -0,0 +1,187 @@
+<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">
+ <parent>
+ <groupId>org.jboss.cluster</groupId>
+ <artifactId>jboss-cluster</artifactId>
+ <version>2.0.0.GA</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.cluster</groupId>
+ <artifactId>jboss-ha-server-cache-spi</artifactId>
+ <packaging>jar</packaging>
+ <version>2.1.0.Final</version>
+ <name>JBoss AS - JBoss Cache Integration SPI</name>
+ <url>http://www.jboss.org</url>
+ <description>SPI for JBoss AS Clustered Caching Services</description>
+ <licenses>
+ <license>
+ <name>lgpl</name>
+ <url>http://repository.jboss.com/licenses/lgpl.txt</url>
+ </license>
+ </licenses>
+ <organization>
+ <name>JBoss, a division of Red Hat, Inc.</name>
+ <url>http://www.jboss.org</url>
+ </organization>
+
+ <scm>
+ <connection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/cluster/ha-server-cache-spi/tags/2.1.0.Final</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/cluster/ha-server-cache-spi/tags/2.1.0.Final</developerConnection>
+ </scm>
+
+ <properties>
+ <version.jboss.ha.server.api>1.1.0.GA</version.jboss.ha.server.api>
+ <!-- This should be [2.6.2,3.0.0) but maven complains about it -->
+ <version.jgroups>2.6.10.GA</version.jgroups>
+ <version.jboss.logging.spi>2.0.5.GA</version.jboss.logging.spi>
+ <version.org.jboss.naming>5.0.2.GA</version.org.jboss.naming>
+ <version.jboss.serialization>1.0.3.GA</version.jboss.serialization>
+ <version.org.jboss.metadata>1.0.0.CR5</version.org.jboss.metadata>
+ <version.junit>3.8.1</version.junit>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <!-- The tagBase property is needed during the release process so that the maven release plugin
+ will create the release tag in the appropriate location. -->
+ <tagBase>https://svn.jboss.org/repos/jbossas/projects/cluster/ha-server-cache-spi/tags</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+
+ <!-- Global dependencies -->
+ <dependency>
+ <groupId>org.jboss.cluster</groupId>
+ <artifactId>jboss-ha-server-api</artifactId>
+ <version>${version.jboss.ha.server.api}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss.aop</groupId>
+ <artifactId>jboss-aop</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.cluster</groupId>
+ <artifactId>jboss-ha-client</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>jgroups</groupId>
+ <artifactId>jgroups</artifactId>
+ <version>${version.jgroups}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.logging</groupId>
+ <artifactId>jboss-logging-spi</artifactId>
+ <version>${version.jboss.logging.spi}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.naming</groupId>
+ <artifactId>jnp-client</artifactId>
+ <version>${version.org.jboss.naming}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-serialization</artifactId>
+ <version>${version.jboss.serialization}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>jboss</groupId>
+ <artifactId>jboss-logging-log4j</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <version>${version.org.jboss.metadata}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ejb3</groupId>
+ <artifactId>jboss-ejb3-ext-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-ejb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-jms-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.hibernate</groupId>
+ <artifactId>ejb3-persistence</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.javaee</groupId>
+ <artifactId>jboss-transaction-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss.ws</groupId>
+ <artifactId>jbossws-spi</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>jboss.jbossws</groupId>
+ <artifactId>jboss-jaxws</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-vfs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>sun-jaxb</groupId>
+ <artifactId>jaxb-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>apache-xerces</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- Test dependencies -->
+ <!--
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${version.junit}</version>
+ <scope>test</scope>
+ </dependency>
+ -->
+
+ </dependencies>
+
+</project>
+
Copied: projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TestDistributedCacheManagerFactory.java (from rev 102688, projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TestDistributedCacheManagerFactory.java)
===================================================================
--- projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TestDistributedCacheManagerFactory.java (rev 0)
+++ projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TestDistributedCacheManagerFactory.java 2010-03-22 01:09:19 UTC (rev 102696)
@@ -0,0 +1,45 @@
+package org.jboss.web.tomcat.service.session.distributedcache.spi;
+
+import java.util.List;
+import java.util.Set;
+
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.
+ */
+
+/**
+ *
+ *
+ * @author Brian Stansberry
+ *
+ * @version $Revision$
+ */
+public interface TestDistributedCacheManagerFactory extends DistributedCacheManagerFactory
+{
+ void configure(boolean local, String passivationDir,
+ boolean totalReplication, boolean marshalling, boolean purgeCacheLoader);
+
+ List<Object> getMembers();
+
+ Object getLocalAddress();
+
+ void cleanup(boolean doRemove);
+}
Copied: projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TestDistributedCacheManagerFactoryFactory.java (from rev 102688, projects/cluster/ha-server-cache-spi/trunk/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TestDistributedCacheManagerFactoryFactory.java)
===================================================================
--- projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TestDistributedCacheManagerFactoryFactory.java (rev 0)
+++ projects/cluster/ha-server-cache-spi/tags/2.1.0.Final/src/main/java/org/jboss/web/tomcat/service/session/distributedcache/spi/TestDistributedCacheManagerFactoryFactory.java 2010-03-22 01:09:19 UTC (rev 102696)
@@ -0,0 +1,109 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file 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.
+ */
+
+package org.jboss.web.tomcat.service.session.distributedcache.spi;
+
+/**
+ *
+ *
+ * @author Brian Stansberry
+ *
+ * @version $Revision$
+ */
+public class TestDistributedCacheManagerFactoryFactory
+{
+ /**
+ * Default name of the class that {@link #getDistributedCacheManagerFactory()}
+ * will try to instantiate if no factory is injected.
+ */
+ public static final String DEFAULT_CLASS_NAME = "org.jboss.web.tomcat.service.session.distributedcache.impl.TestDistributedCacheManagerFactoryImpl";
+
+ private final DistributedCacheManagerFactoryFactory delegate = DistributedCacheManagerFactoryFactory.getInstance();
+
+ private String factoryClassName = DEFAULT_CLASS_NAME;
+
+ /**
+ * Gets the class name of the factory; either the name of any existing
+ * factory, a class name injected via this property's setter, or
+ * {@link #DEFAULT_CLASS_NAME}.
+ *
+ * @return the factory class name; will not return <code>null</code>
+ */
+ public synchronized String getFactoryClassName()
+ {
+ return factoryClassName;
+ }
+
+ /**
+ * Allows injection of the factory class name.
+ *
+ * @param factoryClassName Fully qualified name of a class that implements
+ * {@link DistributedCacheManagerFactory} and exposes
+ * a public no-arg constructor.
+ */
+ public synchronized void setFactoryClassName(String factoryClassName)
+ {
+ this.factoryClassName = factoryClassName == null ? DEFAULT_CLASS_NAME : factoryClassName;
+ }
+
+ /**
+ * Returns the factory, creating one if necessary by loading
+ * {@link #getFactoryClassName() the factory class} and invoking
+ * {@link Class#newInstance()}.
+ *
+ * @return the factory. Will not return <code>null</code>.
+ * @throws ClusteringNotSupportedException if there is a problem instantiating a factory
+ */
+ public synchronized TestDistributedCacheManagerFactory getDistributedCacheManagerFactory(boolean local, String passivationDir,
+ boolean totalReplication, boolean marshalling, boolean purgeCacheLoader)
+ throws ClusteringNotSupportedException
+ {
+ String existingClassName = delegate.getFactoryClassName();
+ DistributedCacheManagerFactory existing = null;
+ try
+ {
+ try
+ {
+ // Set the factory class name to something that won't work
+ // if it's used to create a factory, and then get the factory.
+ // Effect is we only get a factory if it already existed
+ delegate.setFactoryClassName("+++Illegal+++");
+ existing = delegate.getDistributedCacheManagerFactory();
+ delegate.setDistributedCacheManagerFactory(null);
+ }
+ catch (Throwable ignored) {}
+
+ delegate.setFactoryClassName(factoryClassName);
+ TestDistributedCacheManagerFactory fact = (TestDistributedCacheManagerFactory) delegate.getDistributedCacheManagerFactory();
+ fact.configure(local, passivationDir, totalReplication, marshalling, purgeCacheLoader);
+ return fact;
+ }
+ finally
+ {
+ if (existing != null)
+ {
+ delegate.setDistributedCacheManagerFactory(existing);
+ }
+ delegate.setFactoryClassName(existingClassName);
+ }
+ }
+}
More information about the jboss-cvs-commits
mailing list