[jboss-cvs] JBossAS SVN: r66977 - in trunk/ejb3/src: main/org/jboss/annotation/ejb/cache/simple and 26 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Nov 12 15:42:15 EST 2007
Author: ALRubinger
Date: 2007-11-12 15:42:15 -0500 (Mon, 12 Nov 2007)
New Revision: 66977
Added:
trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/Cache.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfig.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfigImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryNotRegisteredException.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryRegistry.java
Removed:
trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/Cache.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfig.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java
trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/tree/
trunk/ejb3/src/main/org/jboss/ejb3/cache/Ejb3Cache.java
Modified:
trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
trunk/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/ClusteredStatefulCache.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/Ejb3CacheFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCacheFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCacheFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCacheFactory.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
trunk/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java
trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
trunk/ejb3/src/resources/ejb3-interceptors-aop.xml
trunk/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml
trunk/ejb3/src/resources/test/clusteredsession/scoped/META-INF/jboss.xml
trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/cache/SimpleStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/cache/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockEjb3Deployment.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/IgnoreReplicationStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OptimizedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree921/MyStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/initial/InterceptedSFTestBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java
trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ShoppingCartBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/PassivationTestBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulClusteredTimeoutBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTimeoutBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalContainedBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleParentStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleRemoteNestedStatefulBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleShoppingCartBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/KeeperBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/LowEndBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/MasterBean.java
trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/XPCAltBean.java
Log:
Resolved External API leak for @Cache
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/Cache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/Cache.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/Cache.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.annotation.ejb.cache;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import org.jboss.ejb3.cache.Ejb3CacheFactory;
-
-/**
- * Annotation for specifying the class used to provide the caching mechanism for a bean
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Retention(RetentionPolicy.RUNTIME)
- at Target({ElementType.TYPE})
-public @interface Cache
-{
- Class<? extends Ejb3CacheFactory> value();
-}
Added: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/Cache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/Cache.java (rev 0)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/Cache.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, 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.annotation.ejb.cache;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Cache
+ *
+ * Annotation used to specify Cache implementation
+ *
+ * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
+ * @version $Revision$
+ */
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target({ElementType.TYPE})
+public @interface Cache
+{
+ String value();
+}
Property changes on: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/Cache.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Added: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfig.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfig.java (rev 0)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfig.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -0,0 +1,65 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, 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.annotation.ejb.cache;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+/**
+ * Annotation to define the caching configuration for a SFSB
+ *
+ * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
+ * @version $Revision: $
+ */
+ at Retention(RetentionPolicy.RUNTIME)
+ at Target(
+{ElementType.TYPE})
+public @interface CacheConfig {
+
+ // Class Members
+
+ public static final String DEFAULT_CLUSTERED_OBJECT_NAME = "jboss.cache:service=EJB3SFSBClusteredCache";
+
+ public static final int DEFAULT_NONCLUSTERED_MAX_SIZE = 100000;
+
+ public static final int DEFAULT_CLUSTERED_MAX_SIZE = 10000;
+
+ public static final long DEFAULT_IDLE_TIMEOUT_SECONDS = 300;
+
+ public static final long DEFAULT_REMOVAL_TIMEOUT_SECONDS = 0;
+
+ public static final boolean DEFAULT_REPL_IS_PASV = true;
+
+ // Instance Members
+
+ String name() default "";
+
+ int maxSize() default CacheConfig.DEFAULT_NONCLUSTERED_MAX_SIZE;
+
+ long idleTimeoutSeconds() default CacheConfig.DEFAULT_IDLE_TIMEOUT_SECONDS;
+
+ boolean replicationIsPassivation() default CacheConfig.DEFAULT_REPL_IS_PASV;
+
+ long removalTimeoutSeconds() default CacheConfig.DEFAULT_REMOVAL_TIMEOUT_SECONDS;
+}
Property changes on: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfig.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfigImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfigImpl.java (rev 0)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfigImpl.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -0,0 +1,133 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, 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.annotation.ejb.cache;
+
+import java.lang.annotation.Annotation;
+
+/**
+ * Implementation of CacheConfig Annotation
+ *
+ * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
+ * @version $Revision: $
+ */
+public class CacheConfigImpl implements CacheConfig
+{
+
+ // Instance Members
+
+ private String name;
+
+ private int maxSize = CacheConfig.DEFAULT_NONCLUSTERED_MAX_SIZE;
+
+ private long idleTimeoutSeconds = CacheConfig.DEFAULT_IDLE_TIMEOUT_SECONDS;
+
+ private long removalTimeoutSeconds = CacheConfig.DEFAULT_REMOVAL_TIMEOUT_SECONDS;
+
+ private boolean replicationIsPassivation = CacheConfig.DEFAULT_REPL_IS_PASV;
+
+ // Constructor
+
+ public CacheConfigImpl()
+ {
+ }
+
+ // Accessors / Mutators
+
+ public String name()
+ {
+ return name;
+ }
+
+ public void setName(String name)
+ {
+ this.name = name;
+ }
+
+ public int maxSize()
+ {
+ return maxSize;
+ }
+
+ public void setMaxSize(int maxSize)
+ {
+ this.maxSize = maxSize;
+ }
+
+ public long idleTimeoutSeconds()
+ {
+ return idleTimeoutSeconds;
+ }
+
+ public void setIdleTimeoutSeconds(long idleTimeoutSeconds)
+ {
+ this.idleTimeoutSeconds = idleTimeoutSeconds;
+ }
+
+ public long removalTimeoutSeconds()
+ {
+ return removalTimeoutSeconds;
+ }
+
+ public void setRemovalTimeoutSeconds(long removalTimeoutSeconds)
+ {
+ this.removalTimeoutSeconds = removalTimeoutSeconds;
+ }
+
+ public boolean replicationIsPassivation()
+ {
+ return replicationIsPassivation;
+ }
+
+ public void setReplicationIsPassivation(boolean replicationIsPassivation)
+ {
+ this.replicationIsPassivation = replicationIsPassivation;
+ }
+
+ public void merge(CacheConfig annotation)
+ {
+ if (maxSize == CacheConfig.DEFAULT_NONCLUSTERED_MAX_SIZE)
+ {
+ maxSize = annotation.maxSize();
+ }
+
+ if (idleTimeoutSeconds == CacheConfig.DEFAULT_IDLE_TIMEOUT_SECONDS)
+ {
+ idleTimeoutSeconds = annotation.idleTimeoutSeconds();
+ }
+
+ if (removalTimeoutSeconds == CacheConfig.DEFAULT_REMOVAL_TIMEOUT_SECONDS)
+ {
+ removalTimeoutSeconds = annotation.removalTimeoutSeconds();
+ }
+
+ if (replicationIsPassivation == CacheConfig.DEFAULT_REPL_IS_PASV)
+ {
+ replicationIsPassivation = annotation.replicationIsPassivation();
+ }
+
+ }
+
+ public Class<? extends Annotation> annotationType()
+ {
+ return CacheConfig.class;
+ }
+}
Property changes on: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheConfigImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.annotation.ejb.cache;
-
-import java.lang.annotation.Annotation;
-
-import org.jboss.ejb3.cache.Ejb3CacheFactory;
-
-/**
- * Comment
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
-public class CacheImpl implements Cache
-{
- private Class<? extends Ejb3CacheFactory> val;
-
- public CacheImpl(Class<? extends Ejb3CacheFactory> val)
- {
- this.val = val;
- }
-
- public Class<? extends Ejb3CacheFactory> value() { return val; }
-
- public Class<? extends Annotation> annotationType()
- {
- return Cache.class;
- }
-}
Added: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java (rev 0)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -0,0 +1,52 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, 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.annotation.ejb.cache;
+
+import java.lang.annotation.Annotation;
+
+import org.jboss.ejb3.cache.Ejb3CacheFactory;
+
+/**
+ * Implementation of @Cache annotation
+ *
+ * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
+ * @version $Revision$
+ */
+public class CacheImpl implements Cache
+{
+ private String value;
+
+ public CacheImpl(String value)
+ {
+ this.value = value;
+ }
+
+ public String value()
+ {
+ return value;
+ }
+
+ public Class<? extends Annotation> annotationType()
+ {
+ return Cache.class;
+ }
+}
Property changes on: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/CacheImpl.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfig.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfig.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfig.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.annotation.ejb.cache.simple;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Annotation for configuring the simple cache parameters for a bean
- *
- * @author <a href="mailto:bill at jboss.org">Bill Burke</a>
- * @version $Revision$
- */
- at Retention(RetentionPolicy.RUNTIME)
- at Target({ElementType.TYPE})
-public @interface CacheConfig
-{
- int maxSize() default 100000;
-
- long idleTimeoutSeconds() default 300;
-
- long removalTimeoutSeconds() default 0;
-}
Deleted: trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/annotation/ejb/cache/simple/CacheConfigImpl.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -1,87 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2006, Red Hat Middleware LLC, 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.annotation.ejb.cache.simple;
-
-import java.lang.annotation.Annotation;
-
-/**
- * @version <tt>$Revision$</tt>
- * @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
- */
-public class CacheConfigImpl implements CacheConfig
-{
- private int maxSize = 100000;
- private long idleTimeoutSeconds = 300;
- private long removalTimeoutSeconds = 0;
-
- public CacheConfigImpl()
- {
- }
-
- public int maxSize()
- {
- return maxSize;
- }
-
- public void setMaxSize(int maxSize)
- {
- this.maxSize = maxSize;
- }
-
- public long idleTimeoutSeconds()
- {
- return idleTimeoutSeconds;
- }
-
- public void setIdleTimeoutSeconds(long idleTimeoutSeconds)
- {
- this.idleTimeoutSeconds = idleTimeoutSeconds;
- }
-
- public long removalTimeoutSeconds()
- {
- return removalTimeoutSeconds;
- }
-
- public void setRemovalTimeoutSeconds(long removalTimeoutSeconds)
- {
- this.removalTimeoutSeconds = removalTimeoutSeconds;
- }
-
- public void merge(CacheConfig annotation)
- {
- if (maxSize == 100000)
- maxSize = annotation.maxSize();
-
- if (idleTimeoutSeconds == 300)
- idleTimeoutSeconds = annotation.idleTimeoutSeconds();
-
- if (removalTimeoutSeconds == 0)
- removalTimeoutSeconds = annotation.removalTimeoutSeconds();
-
- }
-
- public Class<? extends Annotation> annotationType()
- {
- return CacheConfig.class;
- }
-}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3Deployment.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -23,11 +23,9 @@
import java.io.BufferedInputStream;
import java.io.DataInputStream;
-import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedHashMap;
@@ -48,6 +46,10 @@
import org.hibernate.cfg.EJB3DTDEntityResolver;
import org.hibernate.ejb.packaging.PersistenceMetadata;
+import org.jboss.ejb3.cache.CacheFactoryRegistry;
+import org.jboss.ejb3.cache.Ejb3CacheFactory;
+import org.jboss.ejb3.cache.StatefulCache;
+import org.jboss.ejb3.deployers.Ejb3Deployer;
import org.jboss.ejb3.enc.EjbModuleEjbResolver;
import org.jboss.ejb3.enc.EjbModulePersistenceUnitResolver;
import org.jboss.ejb3.enc.MessageDestinationResolver;
@@ -57,15 +59,10 @@
import org.jboss.ejb3.javaee.JavaEEApplication;
import org.jboss.ejb3.javaee.JavaEEComponent;
import org.jboss.ejb3.javaee.JavaEEModule;
-import org.jboss.ejb3.metamodel.EjbJarDD;
-import org.jboss.ejb3.metamodel.EjbJarDDObjectFactory;
-import org.jboss.ejb3.metamodel.JBossDDObjectFactory;
-import org.jboss.ejb3.metamodel.MessageDestination;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.metadata.javaee.spec.MessageDestinationsMetaData;
import org.jboss.virtual.VirtualFile;
-import org.jboss.xb.binding.JBossXBException;
/**
* An EjbModule represents a collection of beans that are deployed as a unit.
@@ -83,6 +80,8 @@
private JBossMetaData metaData;
protected DeploymentUnit unit;
+
+ protected Ejb3Deployer deployer;
protected LinkedHashMap<ObjectName, Container> ejbContainers = new LinkedHashMap<ObjectName, Container>();
@@ -111,11 +110,12 @@
//The JACC PolicyConfiguration
PolicyConfiguration pc;
- public Ejb3Deployment(DeploymentUnit unit, DeploymentScope deploymentScope, JBossMetaData metaData)
+ public Ejb3Deployment(DeploymentUnit unit, DeploymentScope deploymentScope, JBossMetaData metaData, Ejb3Deployer deployer)
{
assert unit != null : "unit is null";
this.unit = unit;
+ this.deployer = deployer;
this.deploymentScope = deploymentScope;
this.metaData = metaData;
try
@@ -168,6 +168,16 @@
{
return defaultSLSBDomain;
}
+
+ public Ejb3Deployer getDeployer()
+ {
+ return this.deployer;
+ }
+
+ public CacheFactoryRegistry<Ejb3CacheFactory<StatefulCache>> getCacheFactoryRegistry()
+ {
+ return this.getDeployer().getCacheFactoryRegistry();
+ }
/**
* Returns a partial MBean attribute name of the form
Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3DescriptorHandler.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -135,6 +135,7 @@
import org.jboss.ejb.StatelessImpl;
import org.jboss.ejb.TransactionAttributeImpl;
import org.jboss.ejb.TransactionManagementImpl;
+import org.jboss.ejb3.cache.CacheFactoryRegistry;
import org.jboss.ejb3.cache.Ejb3CacheFactory;
import org.jboss.ejb3.cache.StatefulCache;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
@@ -1351,14 +1352,15 @@
if (enterpriseBean.getCacheConfig() != null)
{
CacheConfigMetaData config = enterpriseBean.getCacheConfig();
- if (config.getCacheClass() != null)
+ if (config.getValue() != null && !config.getValue().equals(""))
{
- Class<? extends Ejb3CacheFactory> cacheFactoryClass = (Class<? extends Ejb3CacheFactory>) di.getClassLoader().loadClass(config.getCacheClass());
- CacheImpl cacheAnnotation = new CacheImpl(cacheFactoryClass);
+ String cacheValue = config.getValue();
+ CacheImpl cacheAnnotation = new CacheImpl(cacheValue);
addClassAnnotation(container, Cache.class, cacheAnnotation);
// FIXME: Wolf: what the hell is this?
- if (cacheFactoryClass == org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory.class)
+ // FIXME: ALR: This shouldn't be hardcoded; configuration needs reworking
+ if (cacheValue == "SimpleStatefulCache")
{
if (!ejbClass.isAnnotationPresent(PersistenceManager.class))
{
@@ -1372,7 +1374,7 @@
if (config.getName() != null)
{
- org.jboss.annotation.ejb.cache.tree.CacheConfigImpl configAnnotation = new org.jboss.annotation.ejb.cache.tree.CacheConfigImpl();
+ org.jboss.annotation.ejb.cache.CacheConfigImpl configAnnotation = new org.jboss.annotation.ejb.cache.CacheConfigImpl();
configAnnotation.setName(config.getName());
@@ -1388,15 +1390,15 @@
if (config.getRemoveTimeoutSeconds() != null)
configAnnotation.setRemovalTimeoutSeconds(config.getRemoveTimeoutSeconds());
- org.jboss.annotation.ejb.cache.tree.CacheConfig existingConfig = (org.jboss.annotation.ejb.cache.tree.CacheConfig)ejbClass.getAnnotation(org.jboss.annotation.ejb.cache.tree.CacheConfig.class);
+ org.jboss.annotation.ejb.cache.CacheConfig existingConfig = (org.jboss.annotation.ejb.cache.CacheConfig)ejbClass.getAnnotation(org.jboss.annotation.ejb.cache.CacheConfig.class);
if (existingConfig != null)
configAnnotation.merge(existingConfig);
- addClassAnnotation(container, org.jboss.annotation.ejb.cache.tree.CacheConfig.class, configAnnotation);
+ addClassAnnotation(container, org.jboss.annotation.ejb.cache.CacheConfig.class, configAnnotation);
}
else
{
- org.jboss.annotation.ejb.cache.simple.CacheConfigImpl configAnnotation = new org.jboss.annotation.ejb.cache.simple.CacheConfigImpl();
+ org.jboss.annotation.ejb.cache.CacheConfigImpl configAnnotation = new org.jboss.annotation.ejb.cache.CacheConfigImpl();
if (config.getMaxSize() != null)
configAnnotation.setMaxSize(config.getMaxSize());
@@ -1407,11 +1409,11 @@
if (config.getRemoveTimeoutSeconds() != null)
configAnnotation.setRemovalTimeoutSeconds(config.getRemoveTimeoutSeconds());
- org.jboss.annotation.ejb.cache.simple.CacheConfig existingConfig = (org.jboss.annotation.ejb.cache.simple.CacheConfig)ejbClass.getAnnotation(org.jboss.annotation.ejb.cache.simple.CacheConfig.class);
+ org.jboss.annotation.ejb.cache.CacheConfig existingConfig = (org.jboss.annotation.ejb.cache.CacheConfig)ejbClass.getAnnotation(org.jboss.annotation.ejb.cache.CacheConfig.class);
if (existingConfig != null)
configAnnotation.merge(existingConfig);
- addClassAnnotation(container, org.jboss.annotation.ejb.cache.simple.CacheConfig.class, configAnnotation);
+ addClassAnnotation(container, org.jboss.annotation.ejb.cache.CacheConfig.class, configAnnotation);
}
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/Ejb3JmxDeployment.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -22,6 +22,7 @@
package org.jboss.ejb3;
import javax.security.jacc.PolicyConfiguration;
+
import org.jboss.deployment.DeploymentInfo;
import org.jboss.ejb3.javaee.JavaEEComponent;
import org.jboss.ejb3.security.JaccHelper;
@@ -42,7 +43,7 @@
public Ejb3JmxDeployment(DeploymentInfo di, DeploymentScope deploymentScope)
{
- super(new JmxDeploymentUnit(di), deploymentScope, null);
+ super(new JmxDeploymentUnit(di), deploymentScope, null, null);
this.deploymentInfo = di;
kernelAbstraction = new JmxKernelAbstraction(di);
Added: trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryNotRegisteredException.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryNotRegisteredException.java (rev 0)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryNotRegisteredException.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.cache;
+
+/**
+ * CacheFactoryNotRegisteredException
+ *
+ * Thrown when attempting to retrieve a cache factory with
+ * unrecognized name from the registry
+ *
+ * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
+ * @version $Revision: $
+ */
+public class CacheFactoryNotRegisteredException extends Exception
+{
+
+ // Class Members
+ private static final long serialVersionUID = -881723607135494483L;
+
+ // Constructors
+
+ public CacheFactoryNotRegisteredException()
+ {
+ super();
+ }
+
+ public CacheFactoryNotRegisteredException(String message)
+ {
+ super(message);
+ }
+
+}
Property changes on: trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryNotRegisteredException.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added: trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryRegistry.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryRegistry.java (rev 0)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryRegistry.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -0,0 +1,85 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.cache;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.jboss.cache.CacheFactory;
+
+/**
+ * Registry for all configured Stateful Cache Factory implementations
+ *
+ * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
+ * @version $Revision: $
+ */
+public class CacheFactoryRegistry<T extends Ejb3CacheFactory<StatefulCache>>
+{
+ // Instance Members
+ private Map<String, Class<T>> factories;
+
+ // Accessors / Mutators
+
+ public Map<String, Class<T>> getFactories()
+ {
+ return factories;
+ }
+
+ public void setFactories(Map<String, Class<T>> factories)
+ {
+ this.factories = factories;
+ }
+
+ // Functional Methods
+
+ /**
+ * Obtains the Cache Factory with the specified registered name
+ *
+ * @param name The registered name of the cache factory to retrieve
+ * @return The Cache Factory
+ */
+ public T getCacheFactory(String name) throws CacheFactoryNotRegisteredException
+ {
+ // Obtain cache factory
+ Class<T> cacheFactory = this.factories.get(name);
+
+ // Ensure registered
+ if (cacheFactory == null)
+ {
+ throw new CacheFactoryNotRegisteredException("Cache Factory with name " + name + " is not registered.");
+ }
+
+ try
+ {
+ // Return
+ return cacheFactory.newInstance();
+ }
+ catch (InstantiationException e)
+ {
+ throw new RuntimeException("Error in instanciating cache factory " + cacheFactory.getName(), e);
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new RuntimeException(e);
+ }
+ }
+}
Property changes on: trunk/ejb3/src/main/org/jboss/ejb3/cache/CacheFactoryRegistry.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/ClusteredStatefulCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/ClusteredStatefulCache.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/ClusteredStatefulCache.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -29,7 +29,7 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public interface ClusteredStatefulCache extends Ejb3Cache
+public interface ClusteredStatefulCache extends StatefulCache
{
void replicate(StatefulBeanContext ctx);
}
Deleted: trunk/ejb3/src/main/org/jboss/ejb3/cache/Ejb3Cache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/Ejb3Cache.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/Ejb3Cache.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -1,33 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2007, Red Hat Middleware LLC, 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.ejb3.cache;
-
-/**
- * Abstraction of a cache for Stateful instances
- *
- * @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
- * @version $Revision: $
- */
-public interface Ejb3Cache extends StatefulCache
-{
-
-}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/Ejb3CacheFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/Ejb3CacheFactory.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/Ejb3CacheFactory.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -27,7 +27,7 @@
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public interface Ejb3CacheFactory
+public interface Ejb3CacheFactory<T extends StatefulCache>
{
- Ejb3Cache createCache();
+ T createCache();
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCache.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -34,8 +34,8 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public class NoPassivationCache implements Ejb3Cache
-{
+public class NoPassivationCache implements StatefulCache
+{
private Pool pool;
private HashMap<Object, StatefulBeanContext> cacheMap;
private int createCount = 0;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCacheFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCacheFactory.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/NoPassivationCacheFactory.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -27,10 +27,10 @@
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public class NoPassivationCacheFactory implements Ejb3CacheFactory
+public class NoPassivationCacheFactory implements Ejb3CacheFactory<StatefulCache>
{
-
- public Ejb3Cache createCache()
+
+ public StatefulCache createCache()
{
return new NoPassivationCache();
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCache.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -25,15 +25,16 @@
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+
import javax.ejb.EJBException;
import javax.ejb.NoSuchEJBException;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.annotation.ejb.cache.simple.PersistenceManager;
import org.jboss.aop.Advisor;
import org.jboss.ejb3.Container;
import org.jboss.ejb3.EJBContainer;
import org.jboss.ejb3.Pool;
-import org.jboss.ejb3.cache.Ejb3Cache;
import org.jboss.ejb3.cache.StatefulCache;
import org.jboss.ejb3.stateful.StatefulBeanContext;
import org.jboss.logging.Logger;
@@ -44,7 +45,7 @@
* @author <a href="mailto:bill at jboss.org">Bill Burke</a>
* @version $Revision$
*/
-public class SimpleStatefulCache implements Ejb3Cache
+public class SimpleStatefulCache implements StatefulCache
{
private Logger log = Logger.getLogger(SimpleStatefulCache.class);
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCacheFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCacheFactory.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/simple/SimpleStatefulCacheFactory.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -21,8 +21,8 @@
*/
package org.jboss.ejb3.cache.simple;
-import org.jboss.ejb3.cache.Ejb3Cache;
import org.jboss.ejb3.cache.Ejb3CacheFactory;
+import org.jboss.ejb3.cache.StatefulCache;
/**
* Factory for obtaining SimpleStatefulCache instances
@@ -30,10 +30,10 @@
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public class SimpleStatefulCacheFactory implements Ejb3CacheFactory
+public class SimpleStatefulCacheFactory implements Ejb3CacheFactory<StatefulCache>
{
- public Ejb3Cache createCache()
+ public StatefulCache createCache()
{
return new SimpleStatefulCache();
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCache.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -22,18 +22,17 @@
package org.jboss.ejb3.cache.tree;
import java.lang.ref.WeakReference;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.Iterator;
import java.util.Map;
-
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import javax.ejb.EJBException;
import javax.ejb.NoSuchEJBException;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.aop.Advisor;
import org.jboss.cache.Cache;
import org.jboss.cache.CacheException;
Modified: trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCacheFactory.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCacheFactory.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/cache/tree/StatefulTreeCacheFactory.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -21,8 +21,8 @@
*/
package org.jboss.ejb3.cache.tree;
-import org.jboss.ejb3.cache.Ejb3Cache;
import org.jboss.ejb3.cache.Ejb3CacheFactory;
+import org.jboss.ejb3.cache.StatefulCache;
/**
* Factory for obtaining StatefulTreeCache instances
@@ -30,10 +30,10 @@
* @author <a href="mailto:andrew.rubinger at redhat.com">ALR</a>
* @version $Revision: $
*/
-public class StatefulTreeCacheFactory implements Ejb3CacheFactory
+public class StatefulTreeCacheFactory implements Ejb3CacheFactory<StatefulCache>
{
- public Ejb3Cache createCache()
+ public StatefulCache createCache()
{
return new StatefulTreeCache();
}
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/EJBRegistrationDeployer.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -191,7 +191,7 @@
}
JBoss5DeploymentUnit du = new JBoss5DeploymentUnit(unit);
du.setDefaultPersistenceProperties(defaultPersistenceProperties);
- Ejb3JBoss5Deployment deployment = new Ejb3JBoss5Deployment(du, kernel, mbeanServer, unit, scope, null);
+ Ejb3JBoss5Deployment deployment = new Ejb3JBoss5Deployment(du, kernel, mbeanServer, unit, scope, null, null);
if (scope != null) scope.register(deployment);
// create() creates initial EJB containers and initializes metadata.
deployment.create();
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3Deployer.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -32,6 +32,9 @@
import org.jboss.deployment.security.JaccPolicyUtil;
import org.jboss.ejb3.DeploymentScope;
import org.jboss.ejb3.Ejb3Deployment;
+import org.jboss.ejb3.cache.CacheFactoryRegistry;
+import org.jboss.ejb3.cache.Ejb3CacheFactory;
+import org.jboss.ejb3.cache.StatefulCache;
import org.jboss.kernel.Kernel;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
import org.jboss.virtual.VirtualFile;
@@ -58,6 +61,8 @@
private MBeanServer mbeanServer;
+ private CacheFactoryRegistry<Ejb3CacheFactory<StatefulCache>> cacheFactoryRegistry;
+
public Ejb3Deployer()
{
// TODO: when the annotation scanner deployer comes on, we will always have JBossMetaData
@@ -121,7 +126,8 @@
}
JBoss5DeploymentUnit du = new JBoss5DeploymentUnit(unit);
du.setDefaultPersistenceProperties(defaultPersistenceProperties);
- Ejb3JBoss5Deployment deployment = new Ejb3JBoss5Deployment(du, kernel, mbeanServer, unit, scope, metaData);
+ Ejb3JBoss5Deployment deployment = new Ejb3JBoss5Deployment(du, kernel, mbeanServer, unit, scope, metaData,
+ this);
if (scope != null) scope.register(deployment);
// create() creates initial EJB containers and initializes metadata.
deployment.create();
@@ -146,6 +152,16 @@
return allowedSuffixes;
}
+ public CacheFactoryRegistry<Ejb3CacheFactory<StatefulCache>> getCacheFactoryRegistry()
+ {
+ return cacheFactoryRegistry;
+ }
+
+ public void setCacheFactoryRegistry(CacheFactoryRegistry<Ejb3CacheFactory<StatefulCache>> cacheFactoryRegistry)
+ {
+ this.cacheFactoryRegistry = cacheFactoryRegistry;
+ }
+
private boolean hasAllowedSuffix(String name)
{
if(allowedSuffixes == null)
Modified: trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/deployers/Ejb3JBoss5Deployment.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -21,8 +21,6 @@
*/
package org.jboss.ejb3.deployers;
-import java.io.IOException;
-
import javax.management.MBeanServer;
import javax.security.jacc.PolicyConfiguration;
@@ -36,7 +34,6 @@
import org.jboss.kernel.Kernel;
import org.jboss.logging.Logger;
import org.jboss.metadata.ejb.jboss.JBossMetaData;
-import org.jboss.xb.binding.JBossXBException;
/**
* JBoss 4.0 Microkernel specific implementation
@@ -51,9 +48,9 @@
private org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit;
- public Ejb3JBoss5Deployment(DeploymentUnit ejb3Unit, Kernel kernel, MBeanServer mbeanServer, org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit, DeploymentScope deploymentScope, JBossMetaData metaData)
+ public Ejb3JBoss5Deployment(DeploymentUnit ejb3Unit, Kernel kernel, MBeanServer mbeanServer, org.jboss.deployers.structure.spi.DeploymentUnit jbossUnit, DeploymentScope deploymentScope, JBossMetaData metaData, Ejb3Deployer deployer)
{
- super(ejb3Unit, deploymentScope, metaData);
+ super(ejb3Unit, deploymentScope, metaData, deployer);
this.jbossUnit = jbossUnit;
kernelAbstraction = new MCKernelAbstraction(kernel, mbeanServer);
Modified: trunk/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/embedded/EJB3StandaloneDeployment.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -21,20 +21,16 @@
*/
package org.jboss.ejb3.embedded;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.security.jacc.PolicyConfiguration;
import javax.management.MBeanServer;
+import javax.security.jacc.PolicyConfiguration;
+
import org.jboss.ejb3.DependencyPolicy;
import org.jboss.ejb3.DeploymentUnit;
-import org.jboss.ejb3.javaee.JavaEEApplication;
-import org.jboss.ejb3.javaee.JavaEEComponent;
-import org.jboss.ejb3.service.ServiceContainer;
-import org.jboss.ejb3.Container;
import org.jboss.ejb3.Ejb3Deployment;
import org.jboss.ejb3.MCDependencyPolicy;
import org.jboss.ejb3.MCKernelAbstraction;
+import org.jboss.ejb3.javaee.JavaEEApplication;
+import org.jboss.ejb3.javaee.JavaEEComponent;
import org.jboss.ejb3.security.JaccHelper;
import org.jboss.kernel.Kernel;
@@ -49,7 +45,7 @@
{
public EJB3StandaloneDeployment(DeploymentUnit di, Kernel kernel, MBeanServer mbeanServer)
{
- super(di, null, null);
+ super(di, null, null, null);
defaultSFSBDomain = "Embedded Stateful Bean";
kernelAbstraction = new MCKernelAbstraction(kernel, mbeanServer);
Modified: trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java
===================================================================
--- trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/main/org/jboss/ejb3/stateful/StatefulContainer.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -57,9 +57,10 @@
import org.jboss.ejb3.ProxyFactory;
import org.jboss.ejb3.ProxyFactoryHelper;
import org.jboss.ejb3.ProxyUtils;
-import org.jboss.ejb3.cache.Ejb3Cache;
+import org.jboss.ejb3.cache.CacheFactoryRegistry;
+import org.jboss.ejb3.cache.Ejb3CacheFactory;
+import org.jboss.ejb3.cache.StatefulCache;
import org.jboss.ejb3.cache.StatefulObjectFactory;
-import org.jboss.ejb3.cache.StatefulCache;
import org.jboss.ejb3.interceptor.InterceptorInfoRepository;
import org.jboss.ejb3.proxy.EJBMetaDataImpl;
import org.jboss.ejb3.proxy.handle.HomeHandleImpl;
@@ -79,7 +80,7 @@
{
private static final Logger log = Logger.getLogger(StatefulContainer.class);
- protected Ejb3Cache cache;
+ protected StatefulCache cache;
private StatefulDelegateWrapper mbean = new StatefulDelegateWrapper(this);
public StatefulContainer(ClassLoader cl, String beanClassName, String ejbName, AspectManager manager,
@@ -138,7 +139,7 @@
{
super.start();
Cache cacheConfig = getAnnotation(Cache.class);
- cache = cacheConfig.value().newInstance().createCache();
+ cache = this.getCacheFactoryRegistry().getCacheFactory(cacheConfig.value()).createCache();
cache.initialize(this);
cache.start();
}
@@ -167,6 +168,11 @@
{
return cache;
}
+
+ public CacheFactoryRegistry<Ejb3CacheFactory<StatefulCache>> getCacheFactoryRegistry()
+ {
+ return this.getDeployment().getCacheFactoryRegistry();
+ }
/**
* Performs a synchronous local invocation
Modified: trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml
===================================================================
--- trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/resources/META-INF/ejb3-deployers-beans.xml 2007-11-12 20:42:15 UTC (rev 66977)
@@ -14,6 +14,7 @@
<property name="kernel"><inject bean="jboss.kernel:service=Kernel"/></property>
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="defaultPersistenceProperties"><inject bean="DefaultPersistenceProperties" property="properties"/></property>
+ <property name="cacheFactoryRegistry"><inject bean="EJB3CacheFactoryRegistry" /></property>
<!--
@@ -138,6 +139,31 @@
<!-- TODO: check depends -->
<depends>AspectLibrary</depends>
<depends>AppClientScanningDeployer</depends>
+ </bean>
+
+ <!-- EJB3 Cache Factory Registry -->
+ <bean name="EJB3CacheFactoryRegistry" class="org.jboss.ejb3.cache.CacheFactoryRegistry">
+ <property name="factories">
+ <!-- Define each of the registered factories -->
+ <map class="java.util.HashMap" keyClass="java.lang.String"
+ valueClass="java.lang.Class">
+ <!-- NoPassivationCache -->
+ <entry>
+ <key>NoPassivationCache</key>
+ <value>org.jboss.ejb3.cache.NoPassivationCacheFactory</value>
+ </entry>
+ <!-- SimpleStatefulCache -->
+ <entry>
+ <key>SimpleStatefulCache</key>
+ <value>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</value>
+ </entry>
+ <!-- StatefulTreeCache -->
+ <entry>
+ <key>StatefulTreeCache</key>
+ <value>org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory</value>
+ </entry>
+ </map>
+ </property>
</bean>
<bean name="JNDIKernelRegistryPlugin" class="org.jboss.ejb3.kernel.JNDIKernelRegistryPlugin"/>
Modified: trunk/ejb3/src/resources/ejb3-interceptors-aop.xml
===================================================================
--- trunk/ejb3/src/resources/ejb3-interceptors-aop.xml 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/resources/ejb3-interceptors-aop.xml 2007-11-12 20:42:15 UTC (rev 66977)
@@ -197,21 +197,21 @@
<domain name="Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
<!-- NON Clustered cache configuration -->
<annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory.class)
+ @org.jboss.annotation.ejb.cache.Cache ("SimpleStatefulCache")
</annotation>
<annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
<!-- Clustered cache configuration -->
<annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory.class)
+ @org.jboss.annotation.ejb.cache.Cache ("StatefulTreeCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
</domain>
@@ -260,28 +260,28 @@
<!-- NON Clustered cache configuration -->
<annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory.class)
+ @org.jboss.annotation.ejb.cache.Cache ("SimpleStatefulCache")
</annotation>
<annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.PersistenceManager) AND !class(@org.jboss.annotation.ejb.Clustered)">
@org.jboss.annotation.ejb.cache.simple.PersistenceManager (org.jboss.ejb3.cache.simple.StatefulSessionFilePersistenceManager.class)
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.simple.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.simple.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND !class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.CacheConfig (maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
<!-- Clustered cache configuration -->
<annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory.class)
+ @org.jboss.annotation.ejb.cache.Cache ("StatefulTreeCache")
</annotation>
- <annotation expr="!class(@org.jboss.annotation.ejb.cache.tree.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
- @org.jboss.annotation.ejb.cache.tree.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
+ <annotation expr="!class(@org.jboss.annotation.ejb.cache.CacheConfig) AND class(@org.jboss.annotation.ejb.Clustered)">
+ @org.jboss.annotation.ejb.cache.CacheConfig (name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300, removalTimeoutSeconds=0)
</annotation>
</domain>
<domain name="Embedded Stateful Bean" extends="Base Stateful Bean" inheritBindings="true">
<!-- NON Clustered cache configuration -->
<annotation expr="!class(@org.jboss.annotation.ejb.cache.Cache)">
- @org.jboss.annotation.ejb.cache.Cache (org.jboss.ejb3.cache.NoPassivationCacheFactory.class)
+ @org.jboss.annotation.ejb.cache.Cache ("NoPassivationCache")
</annotation>
<annotation expr="!class(@org.jboss.annotation.ejb.JndiBindingPolicy)">
@org.jboss.annotation.ejb.JndiBindingPolicy (policy=org.jboss.ejb3.jndipolicy.PackagingBasedJndiBindingPolicy.class)
@@ -390,5 +390,4 @@
</annotation>
</domain>
-
</aop>
\ No newline at end of file
Modified: trunk/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml
===================================================================
--- trunk/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/resources/test/clusteredsession/META-INF/jboss.xml 2007-11-12 20:42:15 UTC (rev 66977)
@@ -44,7 +44,7 @@
<jndi-name>NonClusteredStatefulRemote</jndi-name>
<clustered>false</clustered>
<cache-config>
- <cache-class>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</cache-class>
+ <cache-type>SimpleStatefulCache</cache-type>
<cache-max-size>1000</cache-max-size>
<idle-timeout-seconds>100</idle-timeout-seconds>
</cache-config>
Modified: trunk/ejb3/src/resources/test/clusteredsession/scoped/META-INF/jboss.xml
===================================================================
--- trunk/ejb3/src/resources/test/clusteredsession/scoped/META-INF/jboss.xml 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/resources/test/clusteredsession/scoped/META-INF/jboss.xml 2007-11-12 20:42:15 UTC (rev 66977)
@@ -47,7 +47,7 @@
<jndi-name>NonClusteredStatefulRemote</jndi-name>
<clustered>false</clustered>
<cache-config>
- <cache-class>org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory</cache-class>
+ <cache-type>SimpleStatefulCache</cache-type>
<cache-max-size>1000</cache-max-size>
<idle-timeout-seconds>100</idle-timeout-seconds>
</cache-config>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/DeploymentDescriptorStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -24,10 +24,10 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.PoolClass;
+import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.PoolClass;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.logging.Logger;
/**
@@ -40,7 +40,7 @@
@Remote(org.jboss.ejb3.test.aspectdomain.Stateful.class)
@RemoteBinding(jndiBinding = "DeploymentDescriptorStateful")
@PoolClass(value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- at Cache(org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory.class)
+ at Cache("StatefulTreeCache")
@CacheConfig(name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
public class DeploymentDescriptorStatefulBean
implements org.jboss.ejb3.test.aspectdomain.Stateful
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/aspectdomain/StatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -25,10 +25,10 @@
import javax.ejb.Stateful;
import org.jboss.annotation.ejb.AspectDomain;
+import org.jboss.annotation.ejb.PoolClass;
+import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
-import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.PoolClass;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.logging.Logger;
/**
@@ -42,7 +42,7 @@
@RemoteBinding(jndiBinding = "Stateful")
@AspectDomain("Test Aspect Domain")
@PoolClass(value=org.jboss.ejb3.ThreadlocalPool.class, maxSize=30, timeout=10000)
- at Cache(org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory.class)
+ at Cache("StatefulTreeCache")
@CacheConfig(name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize=100000, idleTimeoutSeconds=300)
public class StatefulBean
implements org.jboss.ejb3.test.aspectdomain.Stateful
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/cache/SimpleStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/cache/SimpleStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/cache/SimpleStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -27,8 +27,9 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
import javax.naming.InitialContext;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/cache/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/cache/StatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/cache/StatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -25,11 +25,12 @@
import javax.ejb.PostActivate;
import javax.ejb.PrePassivate;
import javax.ejb.Remote;
+import javax.ejb.Remove;
import javax.ejb.Stateful;
-import javax.ejb.Remove;
import javax.naming.InitialContext;
+
import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
/**
* Comment
@@ -38,7 +39,7 @@
* @version $Revision$
*/
@Stateful
- at Cache(org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory.class)
+ at Cache("StatefulTreeCache")
@CacheConfig(name = "jboss.cache:service=EJB3SFSBClusteredCache", maxSize = 1000, idleTimeoutSeconds = 1)
@Local(StatefulLocal.class)
@Remote(StatefulRemote.class)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -29,11 +29,9 @@
import org.jboss.annotation.ejb.PoolClass;
import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.annotation.ejb.cache.simple.PersistenceManager;
import org.jboss.ejb3.ThreadlocalPool;
-import org.jboss.ejb3.cache.simple.SimpleStatefulCache;
-import org.jboss.ejb3.cache.simple.SimpleStatefulCacheFactory;
/**
* Comment
@@ -41,7 +39,7 @@
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
* @version $Revision: $
*/
- at Cache(SimpleStatefulCacheFactory.class)
+ at Cache("SimpleStatefulCache")
@PersistenceManager(MyStatefulSessionFilePersistenceManager.class)
@CacheConfig(idleTimeoutSeconds=1)
@PoolClass(value=ThreadlocalPool.class)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockEjb3Deployment.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockEjb3Deployment.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/cachepassivation/MockEjb3Deployment.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -41,7 +41,7 @@
public MockEjb3Deployment(DeploymentUnit unit, DeploymentScope deploymentScope)
{
- super(unit, deploymentScope, null);
+ super(unit, deploymentScope, null, null);
}
@Override
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/IgnoreReplicationStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/IgnoreReplicationStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/IgnoreReplicationStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -25,7 +25,7 @@
import javax.ejb.Stateful;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
/**
* Stateful bean that configures clustering via annotations.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OptimizedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OptimizedStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OptimizedStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -25,7 +25,7 @@
import javax.ejb.Stateful;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.cache.Optimized;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/OverrideStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -23,8 +23,9 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
+
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.logging.Logger;
import org.jboss.system.server.ServerConfig;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/StatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -25,7 +25,7 @@
import javax.ejb.Stateful;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
/**
* Stateful bean that configures clustering via annotations.
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedContainedBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -26,7 +26,7 @@
import javax.ejb.Stateful;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContainedBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredDeepNestedStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -26,7 +26,7 @@
import javax.ejb.Stateful;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStatefulBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalContainedBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -26,7 +26,7 @@
import javax.ejb.Stateful;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredLocalNestedStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -11,7 +11,7 @@
import javax.ejb.Stateful;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStatefulBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredParentStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -14,7 +14,7 @@
import javax.interceptor.Interceptors;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.clusteredsession.ExplicitFailoverInterceptor;
import org.jboss.ejb3.test.stateful.nested.base.std.ParentStatefulBean;
import org.jboss.ejb3.test.stateful.nested.base.std.ParentStatefulRemote;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteContainedBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -26,7 +26,7 @@
import javax.ejb.Stateful;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredRemoteNestedStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -11,7 +11,7 @@
import javax.ejb.Stateful;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.std.OptimizedNestedStatefulBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/clusteredsession/nested/ClusteredShoppingCartBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -29,7 +29,7 @@
import javax.interceptor.Interceptors;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.clusteredsession.ExplicitFailoverInterceptor;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ShoppingCart;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ShoppingCartBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree921/MyStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree921/MyStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/ejbthree921/MyStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -32,7 +32,6 @@
import javax.persistence.PersistenceContextType;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/initial/InterceptedSFTestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/initial/InterceptedSFTestBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/initial/InterceptedSFTestBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -24,16 +24,17 @@
import java.io.Serializable;
import javax.annotation.Resource;
-import javax.interceptor.AroundInvoke;
import javax.ejb.EJBContext;
-import javax.interceptor.Interceptors;
-import javax.interceptor.InvocationContext;
import javax.ejb.Remote;
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptors;
+import javax.interceptor.InvocationContext;
+import org.jboss.annotation.ejb.cache.CacheConfig;
+
/**
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan</a>
* @version $Revision$
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/InheritingSFSB.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -21,18 +21,18 @@
*/
package org.jboss.ejb3.test.interceptors2;
+import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.ejb.EJB;
-import javax.annotation.PostConstruct;
-import javax.interceptor.AroundInvoke;
-import javax.interceptor.ExcludeDefaultInterceptors;
-import javax.interceptor.InvocationContext;
import javax.ejb.PostActivate;
-import javax.annotation.PreDestroy;
import javax.ejb.PrePassivate;
import javax.ejb.Remove;
import javax.ejb.Stateful;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.ExcludeDefaultInterceptors;
+import javax.interceptor.InvocationContext;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/interceptors2/MixedConfigSFSB.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -22,16 +22,16 @@
package org.jboss.ejb3.test.interceptors2;
import javax.annotation.Resource;
+import javax.ejb.EJBContext;
+import javax.ejb.Remove;
+import javax.ejb.Stateful;
import javax.interceptor.AroundInvoke;
-import javax.ejb.EJBContext;
import javax.interceptor.Interceptors;
import javax.interceptor.InvocationContext;
-import javax.ejb.Remove;
-import javax.ejb.Stateful;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
/**
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ContainedBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -22,15 +22,16 @@
package org.jboss.ejb3.test.longlived;
import java.io.Serializable;
+
+import javax.annotation.PreDestroy;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
+import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
-import javax.persistence.EntityManager;
-import javax.annotation.PreDestroy;
-import javax.ejb.Stateful;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ShoppingCartBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ShoppingCartBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/longlived/ShoppingCartBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -22,18 +22,20 @@
package org.jboss.ejb3.test.longlived;
import java.io.Serializable;
+
import javax.ejb.EJB;
+import javax.ejb.PostActivate;
import javax.ejb.Remote;
import javax.ejb.Remove;
import javax.ejb.Stateful;
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
-import javax.ejb.PostActivate;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
+
/**
* comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/PassivationTestBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/PassivationTestBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/PassivationTestBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -22,6 +22,7 @@
package org.jboss.ejb3.test.regression;
import java.io.Serializable;
+
import javax.ejb.PrePassivate;
import javax.ejb.Remote;
import javax.ejb.Stateful;
@@ -30,10 +31,9 @@
import javax.naming.NamingException;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.PersistenceContext;
import javax.transaction.UserTransaction;
-import javax.persistence.PersistenceContext;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.Container;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree231/StatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -22,13 +22,15 @@
package org.jboss.ejb3.test.regression.ejbthree231;
import java.io.Serializable;
-import javax.ejb.Stateful;
+
+import javax.annotation.Resource;
import javax.ejb.PostActivate;
import javax.ejb.PrePassivate;
import javax.ejb.SessionContext;
-import javax.annotation.Resource;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import javax.ejb.Stateful;
+import org.jboss.annotation.ejb.cache.CacheConfig;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/NonExtendedStatefuBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -22,11 +22,13 @@
package org.jboss.ejb3.test.regression.ejbthree316;
import java.io.Serializable;
+
import javax.ejb.Stateful;
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
+
import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -22,12 +22,14 @@
package org.jboss.ejb3.test.regression.ejbthree316;
import java.io.Serializable;
+
import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
import javax.persistence.PersistenceContextType;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
+
/**
* Comment
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/regression/ejbthree316/StatefulTransientBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -22,13 +22,15 @@
package org.jboss.ejb3.test.regression.ejbthree316;
import java.io.Serializable;
+
import javax.ejb.Stateful;
+import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
-import javax.persistence.EntityManager;
import javax.persistence.PersistenceContextType;
import javax.persistence.Transient;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+
import org.jboss.annotation.ejb.RemoteBinding;
+import org.jboss.annotation.ejb.cache.CacheConfig;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/ClusteredStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -21,32 +21,31 @@
*/
package org.jboss.ejb3.test.stateful;
-import java.io.ObjectOutputStream;
-import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.ObjectOutputStream;
import javax.annotation.Resource;
import javax.annotation.Resources;
import javax.ejb.Init;
import javax.ejb.Local;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateful;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
import javax.interceptor.Interceptors;
import javax.naming.InitialContext;
-import org.jboss.ejb3.Container;
-
import org.jboss.annotation.ejb.Clustered;
import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
import org.jboss.logging.Logger;
-import org.jboss.serial.io.JBossObjectOutputStream;
import org.jboss.serial.io.JBossObjectInputStream;
+import org.jboss.serial.io.JBossObjectOutputStream;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/EntityFacadeBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -21,9 +21,6 @@
*/
package org.jboss.ejb3.test.stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
-import org.jboss.logging.Logger;
-
import javax.annotation.PreDestroy;
import javax.ejb.PostActivate;
import javax.ejb.PrePassivate;
@@ -36,7 +33,10 @@
import javax.persistence.PersistenceContext;
import javax.persistence.PersistenceContextType;
+import org.jboss.annotation.ejb.cache.CacheConfig;
+import org.jboss.logging.Logger;
+
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
*/
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/SmallCacheStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -22,8 +22,9 @@
package org.jboss.ejb3.test.stateful;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
+
/**
* Test small maxSize for cache
*
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -21,31 +21,30 @@
*/
package org.jboss.ejb3.test.stateful;
-import java.io.ObjectOutputStream;
-import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.ObjectOutputStream;
import javax.annotation.Resource;
import javax.annotation.Resources;
import javax.ejb.Init;
import javax.ejb.Local;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
import javax.ejb.Remote;
import javax.ejb.SessionContext;
import javax.ejb.Stateful;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
import javax.interceptor.Interceptors;
import javax.naming.InitialContext;
-import org.jboss.ejb3.Container;
-
import org.jboss.annotation.ejb.RemoteBinding;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
import org.jboss.logging.Logger;
-import org.jboss.serial.io.JBossObjectOutputStream;
import org.jboss.serial.io.JBossObjectInputStream;
+import org.jboss.serial.io.JBossObjectOutputStream;
/**
* Comment
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulClusteredTimeoutBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulClusteredTimeoutBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulClusteredTimeoutBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -26,7 +26,7 @@
import javax.ejb.Stateful;
import org.jboss.annotation.ejb.Clustered;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTimeoutBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTimeoutBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/StatefulTimeoutBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -25,7 +25,7 @@
import javax.ejb.Remove;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.logging.Logger;
/**
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/TreeCacheStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -21,34 +21,32 @@
*/
package org.jboss.ejb3.test.stateful;
-import java.io.ObjectOutputStream;
-import java.io.ByteArrayOutputStream;
import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
+import java.io.ObjectOutputStream;
import javax.annotation.Resource;
import javax.annotation.Resources;
import javax.ejb.Init;
import javax.ejb.Local;
+import javax.ejb.PostActivate;
+import javax.ejb.PrePassivate;
import javax.ejb.Remote;
import javax.ejb.Remove;
import javax.ejb.SessionContext;
import javax.ejb.Stateful;
-import javax.ejb.PrePassivate;
-import javax.ejb.PostActivate;
import javax.interceptor.Interceptors;
import javax.naming.InitialContext;
-import javax.naming.NamingEnumeration;
-import org.jboss.ejb3.Container;
-
import org.jboss.annotation.ejb.RemoteBinding;
import org.jboss.annotation.ejb.cache.Cache;
-import org.jboss.annotation.ejb.cache.tree.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.annotation.security.SecurityDomain;
+import org.jboss.ejb3.Container;
import org.jboss.logging.Logger;
-import org.jboss.serial.io.JBossObjectOutputStream;
import org.jboss.serial.io.JBossObjectInputStream;
+import org.jboss.serial.io.JBossObjectOutputStream;
/**
* @author <a href="mailto:bdecoste at jboss.com">William DeCoste</a>
@@ -62,7 +60,7 @@
@CacheConfig(name="jboss.cache:service=EJB3SFSBClusteredCache", maxSize = 1000, idleTimeoutSeconds = 1)
@SecurityDomain("test")
@Resources({@Resource(name="jdbc/ds", mappedName="java:/DefaultDS")})
- at Cache(org.jboss.ejb3.cache.tree.StatefulTreeCacheFactory.class)
+ at Cache("StatefulTreeCache")
public class TreeCacheStatefulBean implements org.jboss.ejb3.test.stateful.Stateful
{
private static final Logger log = Logger.getLogger(StatefulBean.class);
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleContainedBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleContainedBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -25,7 +25,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedContainedBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedContainedBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -25,7 +25,7 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.DeepNestedContainedBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleDeepNestedStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -25,7 +25,7 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.DeepNestedStatefulBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalContainedBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalContainedBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalContainedBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -25,7 +25,7 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.xpc.Contained;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ContainedBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalNestedStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleLocalNestedStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -10,7 +10,7 @@
import javax.ejb.Local;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStatefulBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleParentStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleParentStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleParentStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -10,7 +10,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.std.ParentStatefulBean;
import org.jboss.ejb3.test.stateful.nested.base.std.ParentStatefulRemote;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleRemoteNestedStatefulBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleRemoteNestedStatefulBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleRemoteNestedStatefulBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -10,7 +10,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.std.NestedStateful;
import org.jboss.ejb3.test.stateful.nested.base.std.OptimizedNestedStatefulBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleShoppingCartBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleShoppingCartBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/stateful/nested/SimpleShoppingCartBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -25,7 +25,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateful;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ShoppingCart;
import org.jboss.ejb3.test.stateful.nested.base.xpc.ShoppingCartBean;
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/KeeperBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/KeeperBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/KeeperBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -36,14 +36,14 @@
import javax.transaction.TransactionManager;
import org.jboss.annotation.JndiInject;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.logging.Logger;
/**
* A SFSB that keeps a reference to a managed entity over passivation.
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
@Stateful
@CacheConfig(idleTimeoutSeconds=5)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/LowEndBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/LowEndBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/LowEndBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -32,14 +32,14 @@
import javax.ejb.TransactionAttribute;
import javax.persistence.EntityManager;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.logging.Logger;
/**
* Comment
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
@Stateful
@CacheConfig(idleTimeoutSeconds=5)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/MasterBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/MasterBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/MasterBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -36,14 +36,14 @@
import javax.transaction.TransactionManager;
import org.jboss.annotation.JndiInject;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.logging.Logger;
/**
* Comment
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
@Stateful
@CacheConfig(idleTimeoutSeconds=5)
Modified: trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/XPCAltBean.java
===================================================================
--- trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/XPCAltBean.java 2007-11-12 20:34:28 UTC (rev 66976)
+++ trunk/ejb3/src/test/org/jboss/ejb3/test/xpcalt/XPCAltBean.java 2007-11-12 20:42:15 UTC (rev 66977)
@@ -43,14 +43,14 @@
import javax.transaction.TransactionManager;
import org.jboss.annotation.JndiInject;
-import org.jboss.annotation.ejb.cache.simple.CacheConfig;
+import org.jboss.annotation.ejb.cache.CacheConfig;
import org.jboss.logging.Logger;
/**
* An alternative to extended persistence context.
*
* @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
+ * @version $Revision$
*/
@Stateful
@Local(EntityManager.class)
More information about the jboss-cvs-commits
mailing list