[jboss-cvs] JBossAS SVN: r85769 - in projects/ejb3/trunk: proxy-impl and 20 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Mar 12 01:57:29 EDT 2009


Author: ALRubinger
Date: 2009-03-12 01:57:28 -0400 (Thu, 12 Mar 2009)
New Revision: 85769

Added:
   projects/ejb3/trunk/proxy-impl/
   projects/ejb3/trunk/proxy-impl/jboss-ejb3-proxy-impl-client.xml
   projects/ejb3/trunk/proxy-impl/pom.xml
   projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl/
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/impl/
   projects/ejb3/trunk/proxy-impl/src/test/resources/org/jboss/ejb3/test/proxy/impl/
Removed:
   projects/ejb3/trunk/proxy-impl/jboss-ejb3-proxy-client.xml
   projects/ejb3/trunk/proxy-impl/pom.xml
   projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/factory/
   projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/handler/
   projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/invocation/
   projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/jndiregistrar/
   projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/objectfactory/
   projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/objectstore/
   projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/remoting/
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/SessionTestCaseBase.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/Utils.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/ProxyTestClassAdvisor.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/ProxyTestClassProxyHack.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/ServiceContainer.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/SessionContainer.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/SessionSpecContainer.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/StatefulContainer.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/StatelessContainer.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/unit/
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/ejb/service/
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/ejb/sfsb/
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/ejb/slsb/
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/ReturnStaticValueInterceptor.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStack.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStackBeanBase.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStackStatefulBean.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStackStatelessBean.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/unit/
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1529/ExplicitInvokerNameBean.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1529/ExplicitInvokerNameRemoteBusiness.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1529/unit/
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/BindingTest.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/ClientBindUrlBindingTest.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/ClientBindUrlTestBean.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/JndiBindingTestBean.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/JndiBindingTestBeanBase.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/LocalJndiBindingTest.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/RemoteBindingNoJndiBindingTestBean.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/RemoteJndiBindingTest.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/unit/
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/remoteaccess/unit/
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/session/unit/
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/spec_3_4_5/ProxyEqualityTestCaseBase.java
   projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/spec_3_4_5/unit/
   projects/ejb3/trunk/proxy-impl/src/test/resources/org/jboss/ejb3/test/proxy/common/SessionTestCaseBase-jboss-beans.xml
   projects/ejb3/trunk/proxy-impl/src/test/resources/org/jboss/ejb3/test/proxy/common/container/unit/
   projects/ejb3/trunk/proxy-impl/src/test/resources/org/jboss/ejb3/test/proxy/ejbthree1517/unit/
   projects/ejb3/trunk/proxy-impl/src/test/resources/org/jboss/ejb3/test/proxy/ejbthree1529/unit/
   projects/ejb3/trunk/proxy-impl/src/test/resources/org/jboss/ejb3/test/proxy/jndiregistrar/unit/
   projects/ejb3/trunk/proxy-impl/src/test/resources/org/jboss/ejb3/test/proxy/remoteaccess/unit/
   projects/ejb3/trunk/proxy-impl/src/test/resources/org/jboss/ejb3/test/proxy/session/unit/
   projects/ejb3/trunk/proxy-impl/src/test/resources/org/jboss/ejb3/test/proxy/spec_3_4_5/unit/
   projects/ejb3/trunk/proxy/
Modified:
   projects/ejb3/trunk/pom.xml
Log:
[EJBTHREE-1767] Move folder structure of proxy to proxy-impl

Modified: projects/ejb3/trunk/pom.xml
===================================================================
--- projects/ejb3/trunk/pom.xml	2009-03-12 05:55:23 UTC (rev 85768)
+++ projects/ejb3/trunk/pom.xml	2009-03-12 05:57:28 UTC (rev 85769)
@@ -56,8 +56,9 @@
     <module>mc-int</module>
     <module>plugin</module>
     <module>pool</module>
-    <module>proxy</module>
+    <module>proxy-impl</module>
     <module>proxy-clustered</module>
+    <module>proxy-spi</module>
     <!-- module>sandbox</module -->
     <module>security</module>
     <module>test</module>

Copied: projects/ejb3/trunk/proxy-impl (from rev 85752, projects/ejb3/trunk/proxy)


Property changes on: projects/ejb3/trunk/proxy-impl
___________________________________________________________________
Name: svn:ignore
   + eclipse-target
target-eclipse
target

Name: svn:mergeinfo
   + 

Deleted: projects/ejb3/trunk/proxy-impl/jboss-ejb3-proxy-client.xml
===================================================================
--- projects/ejb3/trunk/proxy/jboss-ejb3-proxy-client.xml	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/jboss-ejb3-proxy-client.xml	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  vi:ts=2:sw=2:expandtab:
--->
-<assembly xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.0.0.xsd"
->
-  <id>client</id>
-  <formats>
-    <format>jar</format>
-  </formats>
-  <includeBaseDirectory>false</includeBaseDirectory>
-  <fileSets>
-    <fileSet>
-      <directory>target/classes</directory>
-      <outputDirectory></outputDirectory>
-      
-      <!-- 
-      
-      Most of the classes in the Proxy Component are
-      required on the Client CP, so we'll stick with 
-      exclude patterns to hide internals
-      
-       -->
-      <excludes>
-        <exclude>org/jboss/ejb3/proxy/jndiregistrar/**</exclude>
-      </excludes>
-    </fileSet>
-
-  </fileSets>
-</assembly>

Copied: projects/ejb3/trunk/proxy-impl/jboss-ejb3-proxy-impl-client.xml (from rev 85763, projects/ejb3/trunk/proxy/jboss-ejb3-proxy-impl-client.xml)
===================================================================
--- projects/ejb3/trunk/proxy-impl/jboss-ejb3-proxy-impl-client.xml	                        (rev 0)
+++ projects/ejb3/trunk/proxy-impl/jboss-ejb3-proxy-impl-client.xml	2009-03-12 05:57:28 UTC (rev 85769)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  vi:ts=2:sw=2:expandtab:
+-->
+<assembly xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/assembly-1.0.0.xsd"
+>
+  <id>client</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target/classes</directory>
+      <outputDirectory></outputDirectory>
+      
+      <!-- 
+      
+      Most of the classes in the Proxy Component are
+      required on the Client CP, so we'll stick with 
+      exclude patterns to hide internals
+      
+       -->
+      <excludes>
+        <exclude>org/jboss/ejb3/proxy/impl/jndiregistrar/**</exclude>
+      </excludes>
+    </fileSet>
+
+  </fileSets>
+</assembly>

Deleted: projects/ejb3/trunk/proxy-impl/pom.xml
===================================================================
--- projects/ejb3/trunk/proxy/pom.xml	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/pom.xml	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,154 +0,0 @@
-<!--
-  vi:ts=2:sw=2:expandtab
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
-  <!-- Parent -->
-  <parent>
-    <groupId>org.jboss.ejb3</groupId>
-    <artifactId>jboss-ejb3-build</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
-  </parent>
-
-  <!-- Model Version -->
-  <modelVersion>4.0.0</modelVersion>
-
-  <!-- Artifact Configuration -->
-  <groupId>org.jboss.ejb3</groupId>
-  <artifactId>jboss-ejb3-proxy</artifactId>
-  <version>1.0.1-SNAPSHOT</version>
-  <name>JBoss EJB 3.0 Proxy</name>
-  <description>JBoss EJB3 Proxy Component</description>
-  <url>http://www.jboss.org/jbossejb3</url>
-
-  <!-- Build Configuration -->
-  <build>
-
-    <plugins>
-
-      <!-- Build a CP File for use by MockServer -->     
-      <plugin>
-        <artifactId>maven-dependency-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>build-cp-file</id>
-            <phase>validate</phase>
-            <goals>
-              <goal>build-classpath</goal>
-            </goals>
-            <configuration>
-              <outputFile>target/cp.txt</outputFile>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-
-      <!-- Assembly Plugin (Proxy Client) -->
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.2-beta-1</version>
-        <executions>
-          <execution>
-            <id>make-assembly</id>
-            <phase>package</phase>
-            <goals>
-              <goal>attached</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <descriptors>
-            <descriptor>jboss-ejb3-proxy-client.xml</descriptor>
-          </descriptors>
-          <attach>true</attach>
-        </configuration>
-        <inherited>false</inherited>
-      </plugin>
-
-    </plugins>
-
-  </build>
-  
-  <!-- Dependencies -->
-  <dependencies>
-
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
-    
-    <!-- JBoss Remoting Aspects -->
-    <dependency>
-      <groupId>org.jboss.aspects</groupId>
-      <artifactId>jboss-remoting-aspects</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-common</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-interceptors</artifactId>
-      <version>1.0.0</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-proxy-spi</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-test</artifactId>
-      <version>1.0.0</version>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.ejb3</groupId>
-      <artifactId>jboss-ejb3-test-remote</artifactId>
-      <version>0.0.1-SNAPSHOT</version>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging-spi</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.logging</groupId>
-      <artifactId>jboss-logging-log4j</artifactId>
-      <scope>test</scope>
-    </dependency>
-    
-    <dependency>
-      <groupId>org.jboss.metadata</groupId>
-      <artifactId>jboss-metadata</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.jboss.naming</groupId>
-      <artifactId>jnpserver</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    
-    <!-- 
-     Needed by remoting, not declared as runtime dependency? 
-     
-     Remove if possible later
-    -->
-    <dependency>
-      <groupId>oswego-concurrent</groupId>
-      <artifactId>concurrent</artifactId>
-      <version>1.3.4-jboss-update1</version>
-      <scope>test</scope>
-    </dependency>
-
-  </dependencies>
-</project>

Copied: projects/ejb3/trunk/proxy-impl/pom.xml (from rev 85763, projects/ejb3/trunk/proxy/pom.xml)
===================================================================
--- projects/ejb3/trunk/proxy-impl/pom.xml	                        (rev 0)
+++ projects/ejb3/trunk/proxy-impl/pom.xml	2009-03-12 05:57:28 UTC (rev 85769)
@@ -0,0 +1,154 @@
+<!--
+  vi:ts=2:sw=2:expandtab
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <!-- Parent -->
+  <parent>
+    <groupId>org.jboss.ejb3</groupId>
+    <artifactId>jboss-ejb3-build</artifactId>
+    <version>1.0.3-SNAPSHOT</version>
+  </parent>
+
+  <!-- Model Version -->
+  <modelVersion>4.0.0</modelVersion>
+
+  <!-- Artifact Configuration -->
+  <groupId>org.jboss.ejb3</groupId>
+  <artifactId>jboss-ejb3-proxy-impl</artifactId>
+  <version>1.0.1-SNAPSHOT</version>
+  <name>JBoss EJB 3.x Proxy Implementation (Internals)</name>
+  <description>JBoss EJB 3.x Proxy Implementation (Internals)</description>
+  <url>http://www.jboss.org/jbossejb3</url>
+
+  <!-- Build Configuration -->
+  <build>
+
+    <plugins>
+
+      <!-- Build a CP File for use by MockServer -->     
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>build-cp-file</id>
+            <phase>validate</phase>
+            <goals>
+              <goal>build-classpath</goal>
+            </goals>
+            <configuration>
+              <outputFile>target/cp.txt</outputFile>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+
+      <!-- Assembly Plugin (Proxy Client) -->
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.2-beta-1</version>
+        <executions>
+          <execution>
+            <id>make-assembly</id>
+            <phase>package</phase>
+            <goals>
+              <goal>attached</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <descriptors>
+            <descriptor>jboss-ejb3-proxy-impl-client.xml</descriptor>
+          </descriptors>
+          <attach>true</attach>
+        </configuration>
+        <inherited>false</inherited>
+      </plugin>
+
+    </plugins>
+
+  </build>
+  
+  <!-- Dependencies -->
+  <dependencies>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <!-- JBoss Remoting Aspects -->
+    <dependency>
+      <groupId>org.jboss.aspects</groupId>
+      <artifactId>jboss-remoting-aspects</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-common</artifactId>
+      <version>1.0.0</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-interceptors</artifactId>
+      <version>1.0.0</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-proxy-spi</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-test</artifactId>
+      <version>1.0.0</version>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.ejb3</groupId>
+      <artifactId>jboss-ejb3-test-remote</artifactId>
+      <version>0.0.1-SNAPSHOT</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-spi</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging-log4j</artifactId>
+      <scope>test</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>org.jboss.metadata</groupId>
+      <artifactId>jboss-metadata</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.jboss.naming</groupId>
+      <artifactId>jnpserver</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    
+    <!-- 
+     Needed by remoting, not declared as runtime dependency? 
+     
+     Remove if possible later
+    -->
+    <dependency>
+      <groupId>oswego-concurrent</groupId>
+      <artifactId>concurrent</artifactId>
+      <version>1.3.4-jboss-update1</version>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+</project>

Copied: projects/ejb3/trunk/proxy-impl/src/main/java/org/jboss/ejb3/proxy/impl (from rev 85763, projects/ejb3/trunk/proxy/src/main/java/org/jboss/ejb3/proxy/impl)

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/SessionTestCaseBase.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/SessionTestCaseBase.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/SessionTestCaseBase.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.common;
-
-import java.net.URL;
-
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.AspectXmlLoader;
-import org.jboss.ejb3.common.registrar.plugin.mc.Ejb3McRegistrar;
-import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-import org.jboss.logging.Logger;
-
-/**
- * SessionTestCaseBase
- * 
- * Operations common to Proxy Session Test Cases
- *
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public abstract class SessionTestCaseBase
-{
-   // --------------------------------------------------------------------------------||
-   // Class Members ------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   private static final Logger log = Logger.getLogger(SessionTestCaseBase.class);
-
-   protected static EmbeddedTestMcBootstrap bootstrap;
-
-   protected static final String FILENAME_EJB3_INTERCEPTORS_AOP = "ejb3-interceptors-aop.xml";
-
-   // --------------------------------------------------------------------------------||
-   // Lifecycle Methods --------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   public static void setUpBeforeClass() throws Throwable
-   {
-      bootstrap = new EmbeddedTestMcBootstrap();
-      bootstrap.run();
-
-      // Bind the Registrar
-      Ejb3RegistrarLocator.bindRegistrar(new Ejb3McRegistrar(bootstrap.getKernel()));
-
-      // Load ejb3-interceptors-aop.xml into AspectManager
-      ClassLoader cl = Thread.currentThread().getContextClassLoader();
-      String ejb3InterceptorsAopFilename = getEjb3InterceptorsAopFilename();
-      URL url = cl.getResource(ejb3InterceptorsAopFilename);
-      if (url == null)
-      {
-         throw new RuntimeException("Could not load " + AspectManager.class.getSimpleName()
-               + " with definitions from XML as file " + ejb3InterceptorsAopFilename + " could not be found");
-      }
-      AspectXmlLoader.deployXML(url);
-      log.info("Deployed AOP XML: " + ejb3InterceptorsAopFilename);
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Accessors ----------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   protected static String getEjb3InterceptorsAopFilename()
-   {
-      return SessionTestCaseBase.FILENAME_EJB3_INTERCEPTORS_AOP;
-   }
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/Utils.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/Utils.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/Utils.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,131 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.common;
-
-import org.jboss.ejb3.test.common.MetaDataHelper;
-import org.jboss.ejb3.test.proxy.common.container.ServiceContainer;
-import org.jboss.ejb3.test.proxy.common.container.StatefulContainer;
-import org.jboss.ejb3.test.proxy.common.container.StatelessContainer;
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ejb.jboss.JBossServiceBeanMetaData;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.BasicJndiBindingPolicy;
-import org.jboss.metadata.ejb.jboss.jndipolicy.plugins.JBossSessionPolicyDecorator;
-
-/**
- * Utils
- * 
- * Utilities for Generating Test EJBs
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public class Utils
-{
-   // --------------------------------------------------------------------------------||
-   // Class Members ------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   private static final Logger log = Logger.getLogger(Utils.class);
-
-   // --------------------------------------------------------------------------------||
-   // Functional Methods -------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Creates and returns a SLSB Container for the SLSB Implementation Class specified
-    * 
-    * @param slsbImplementationClass
-    * @return
-    * @throws Throwable
-    */
-   public static StatelessContainer createSlsb(Class<?> slsbImplementationClass) throws Throwable
-   {
-      // Get Metadata
-      JBossSessionBeanMetaData beanMetaData = MetaDataHelper.getMetadataFromBeanImplClass(slsbImplementationClass);
-
-      // Decorate Metadata
-      beanMetaData = new JBossSessionPolicyDecorator(beanMetaData, new BasicJndiBindingPolicy());
-
-      // Make a Container
-      StatelessContainer container = new StatelessContainer(beanMetaData, Thread.currentThread()
-            .getContextClassLoader());
-
-      // Return
-      return container;
-   }
-
-   /**
-    * Creates and returns a SLSB Container for the SLSB Implementation Class specified
-    * 
-    * @param sfsbImplementationClass
-    * @return
-    * @throws Throwable
-    */
-   public static StatefulContainer createSfsb(Class<?> sfsbImplementationClass) throws Throwable
-   {
-      // Get Metadata
-      JBossSessionBeanMetaData beanMetaData = MetaDataHelper.getMetadataFromBeanImplClass(sfsbImplementationClass);
-
-      // Decorate Metadata
-      beanMetaData = new JBossSessionPolicyDecorator(beanMetaData, new BasicJndiBindingPolicy());
-
-      // Make a Container
-      StatefulContainer container = new StatefulContainer(beanMetaData, Thread.currentThread().getContextClassLoader());
-
-      // Return
-      return container;
-   }
-
-   /**
-    * Creates and returns a @Service Container for the Service Implementation Class specified
-    * 
-    * @param sfsbImplementationClass
-    * @return
-    * @throws Throwable
-    */
-   public static ServiceContainer createService(Class<?> serviceImplementationClass) throws Throwable
-   {
-      // Get Metadata
-      JBossSessionBeanMetaData beanMetaData = MetaDataHelper.getMetadataFromBeanImplClass(serviceImplementationClass);
-
-      // Ensure @Service
-      if (!beanMetaData.isService())
-      {
-         throw new RuntimeException("Specified implementation class for @Service was not a Service Bean: "
-               + serviceImplementationClass.getName());
-      }
-
-      // Cast
-      JBossServiceBeanMetaData smd = (JBossServiceBeanMetaData) beanMetaData;
-
-      // Decorate Metadata
-      beanMetaData = new JBossSessionPolicyDecorator(smd, new BasicJndiBindingPolicy());
-
-      // Make a Container
-      ServiceContainer container = new ServiceContainer(smd, Thread.currentThread().getContextClassLoader());
-
-      // Return
-      return container;
-   }
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/ProxyTestClassAdvisor.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/container/ProxyTestClassAdvisor.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/ProxyTestClassAdvisor.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,157 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.common.container;
-
-import java.lang.reflect.Method;
-import java.util.Set;
-
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.ClassAdvisor;
-import org.jboss.aop.util.MethodHashing;
-import org.jboss.logging.Logger;
-
-/**
- * ProxyTestClassAdvisor
- *
- * An Advisor for SessionContainers used in the EJB3
- * Proxy Test Suite
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public class ProxyTestClassAdvisor extends ClassAdvisor
-{
-
-   // --------------------------------------------------------------------------------||
-   // Class Members ------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Logger
-    */
-   private static final Logger log = Logger.getLogger(ProxyTestClassAdvisor.class);
-
-   // --------------------------------------------------------------------------------||
-   // Instance Members ---------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * The backing SessionContainer to be advised
-    */
-   private SessionContainer container;
-
-   // --------------------------------------------------------------------------------||
-   // Constructor --------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Constructor
-    * 
-    * Creates an Advisor targeted for the specified SessionContainer,
-    * repopulating the method tables and rebuilding the method chains
-    * to include virtual methods defined by the EJB itself.
-    * 
-    * @param container
-    * @param manager
-    */
-   public ProxyTestClassAdvisor(SessionContainer container, AspectManager manager)
-   {
-      // Call Super implementation, advising the Bean Implementation class
-      super(container.getBeanClass(), manager);
-
-      // Set the Container
-      this.setContainer(container);
-
-      // Recreate Method Tables (advisedMethods)
-      try
-      {
-         this.createMethodTables();
-      }
-      catch (Exception e)
-      {
-         throw new RuntimeException(e);
-      }
-
-      // Reinitialize the method chain (for methodInfos)
-      this.initializeMethodChain();
-
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Overridden Implementations -----------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Overridden method tables definition to include
-    * virtual methods declared by the Container's EJB
-    */
-   @Override
-   protected void createMethodTables() throws Exception
-   {
-      // Call Super
-      super.createMethodTables();
-
-      // Obtain Virtual Methods declared by the EJB
-      Set<Method> virtualMethods = getVirtualMethods();
-
-      // If virtual methods exist
-      if (virtualMethods != null)
-      {
-         // For each virtual method
-         for (Method virtualMethod : virtualMethods)
-         {
-            // Calculate the hash
-            long hash = MethodHashing.methodHash(virtualMethod);
-
-            // Add to the advised methods
-            this.advisedMethods.put(hash, virtualMethod);
-
-            // Log
-            log.debug("Added method with hash " + hash + " to those advised for " + this.clazz + ": " + virtualMethod);
-         }
-      }
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Accessors / Mutators -----------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Delegates back to the Container to obtain virtual methods
-    * declared by the EJB
-    */
-   private Set<Method> getVirtualMethods()
-   {
-      return this.getContainer().getVirtualMethods();
-   }
-
-   protected SessionContainer getContainer()
-   {
-      return container;
-   }
-
-   private void setContainer(SessionContainer container)
-   {
-      this.container = container;
-   }
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/ProxyTestClassProxyHack.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/container/ProxyTestClassProxyHack.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/ProxyTestClassProxyHack.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,74 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.ejb3.test.proxy.common.container;
-
-import org.jboss.aop.InstanceAdvisor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.InvocationResponse;
-import org.jboss.aop.proxy.ClassProxy;
-import org.jboss.aop.proxy.ProxyMixin;
-import org.jboss.ejb3.proxy.spi.container.InvokableContext;
-import org.jboss.util.NotImplementedException;
-
-/**
- * ProxyTestClassProxyHack
- *
- * Adapted from ClassProxyHack in EJB3 Core
- * (ie. Carlo).
- * 
- * Used to expose the dynamic invocation handling
- * of an InvokableContext to Remoting
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-class ProxyTestClassProxyHack implements ClassProxy
-{
-   private InvokableContext container;
-
-   ProxyTestClassProxyHack(InvokableContext container)
-   {
-      assert container != null : "Specified " + InvokableContext.class.getSimpleName() + " may not be null.";
-      this.container = container;
-   }
-
-   public InvocationResponse _dynamicInvoke(Invocation invocation) throws Throwable
-   {
-      return container.dynamicInvoke(invocation);
-   }
-
-   public void setMixins(ProxyMixin[] mixins)
-   {
-      throw new NotImplementedException();
-   }
-
-   public InstanceAdvisor _getInstanceAdvisor()
-   {
-      throw new NotImplementedException();
-   }
-
-   public void _setInstanceAdvisor(InstanceAdvisor newAdvisor)
-   {
-      throw new NotImplementedException();
-   }
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/ServiceContainer.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/container/ServiceContainer.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/ServiceContainer.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,137 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.common.container;
-
-import java.io.Serializable;
-import java.util.UUID;
-
-import org.jboss.ejb3.proxy.objectstore.ObjectStoreBindings;
-import org.jboss.ejb3.proxy.spi.container.InvokableContext;
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-
-/**
- * A simple @Service container that binds proxies and can be invoked.
- * 
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class ServiceContainer extends SessionSpecContainer implements InvokableContext
-{
-
-   // --------------------------------------------------------------------------------||
-   // Class Members ------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   private static final Logger log = Logger.getLogger(ServiceContainer.class);
-
-   // --------------------------------------------------------------------------------||
-   // Instance Members ---------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Singleton instance
-    */
-   private Object beanInstance;
-
-   // --------------------------------------------------------------------------------||
-   // Constructors -------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   public ServiceContainer(JBossSessionBeanMetaData metaData, ClassLoader classLoader) throws ClassNotFoundException
-   {
-      super(metaData, classLoader);
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Required Implementations -------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Creates a unique name for this container
-    * 
-    * @return
-    */
-   @Override
-   protected final String createContainerName()
-   {
-      return ObjectStoreBindings.OBJECTSTORE_NAMESPACE_EJBCONTAINER_SERVICE + this.getMetaData().getEjbName() + "/"
-            + UUID.randomUUID();
-   }
-
-   /**
-    * Returns the name under which the JNDI Registrar for this container is bound
-    * 
-    * @return
-    */
-   @Override
-   protected String getJndiRegistrarBindName()
-   {
-      return ObjectStoreBindings.OBJECTSTORE_BEAN_NAME_JNDI_REGISTRAR_SERVICE;
-   }
-
-   /**
-    * Obtains the appropriate bean instance for invocation.
-    * Specified Session ID will be ignored
-    * 
-    * @param sessionId
-    * @return
-    */
-   @Override
-   //FIXME: @Service has no Session ID
-   protected synchronized Object getBeanInstance(Serializable sessionId)
-   {
-      // Check if bean instance is not yet created
-      if (this.getBeanInstance() == null)
-      {
-         try
-         {
-            // Create and set the instance
-            Object beanInstance = this.createInstance();
-            this.setBeanInstance(beanInstance);
-            log.info("Set bean (Singleton) instance: " + beanInstance);
-         }
-         catch (Throwable t)
-         {
-            throw new RuntimeException("Error in creating new @Service Bean Instance", t);
-         }
-      }
-
-      // Return
-      return this.getBeanInstance();
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Accessors / Mutators -----------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   protected Object getBeanInstance()
-   {
-      return beanInstance;
-   }
-
-   protected void setBeanInstance(Object beanInstance)
-   {
-      this.beanInstance = beanInstance;
-   }
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/SessionContainer.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/container/SessionContainer.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/SessionContainer.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,623 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.common.container;
-
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-
-import org.jboss.aop.Advisor;
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.Dispatcher;
-import org.jboss.aop.MethodInfo;
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.aop.joinpoint.InvocationResponse;
-import org.jboss.aop.joinpoint.MethodInvocation;
-import org.jboss.beans.metadata.api.annotations.Start;
-import org.jboss.beans.metadata.api.annotations.Stop;
-import org.jboss.ejb3.common.lang.SerializableMethod;
-import org.jboss.ejb3.common.registrar.spi.Ejb3Registrar;
-import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
-import org.jboss.ejb3.common.registrar.spi.NotBoundException;
-import org.jboss.ejb3.proxy.jndiregistrar.JndiSessionRegistrarBase;
-import org.jboss.ejb3.proxy.remoting.StatefulSessionRemotingMetadata;
-import org.jboss.ejb3.proxy.spi.container.InvokableContext;
-import org.jboss.ejb3.proxy.spi.intf.SessionProxy;
-import org.jboss.ejb3.proxy.spi.intf.StatefulSessionProxy;
-import org.jboss.logging.Logger;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-import org.jboss.metadata.ejb.spec.BusinessLocalsMetaData;
-import org.jboss.metadata.ejb.spec.BusinessRemotesMetaData;
-
-/**
- * SessionContainer
- *
- * A Mock Session Container for use in Proxy Testing
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public abstract class SessionContainer implements InvokableContext
-{
-   // --------------------------------------------------------------------------------||
-   // Class Members ------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   private static final Logger log = Logger.getLogger(SessionContainer.class);
-
-   // --------------------------------------------------------------------------------||
-   // Instance Members ---------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * The unique name under which this container has been registered
-    */
-   private String name;
-
-   /**
-    * The CL for this container and all classes associated with this EJB
-    */
-   private ClassLoader classLoader;
-
-   /**
-    * Metadata for this Container
-    */
-   private JBossSessionBeanMetaData metaData;
-
-   /**
-    * The Bean Implementation Class
-    */
-   private Class<?> beanClass;
-
-   /**
-    * The optional JNDI Registrar
-    */
-   private JndiSessionRegistrarBase jndiRegistrar;
-
-   /**
-    * The JNDI Context to use for binding
-    */
-   private Context jndiContext;
-
-   /**
-    * The AOP Advisor
-    */
-   private Advisor advisor;
-
-   // --------------------------------------------------------------------------------||
-   // Constructor --------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Constructor
-    * 
-    * @param metaData
-    * @param classLoader
-    */
-   protected SessionContainer(JBossSessionBeanMetaData metaData, ClassLoader classLoader)
-   {
-      // Set Metadata
-      this.setMetaData(metaData);
-
-      // Set CL
-      this.setClassLoader(classLoader);
-
-      // Set name
-      this.setName(this.createContainerName());
-
-      // Set Bean Class
-      String beanClassName = this.getMetaData().getEjbClass();
-      try
-      {
-         this.setBeanClass(this.getClassLoader().loadClass(beanClassName));
-      }
-      catch (ClassNotFoundException e)
-      {
-         throw new RuntimeException("Could not find Bean Implementation class \"" + beanClassName + "\" in the "
-               + ClassLoader.class.getSimpleName() + " for " + this);
-      }
-
-      // Set Advisor
-      AspectManager aspectManager = AspectManager.instance(this.getClassLoader());
-      Advisor advisor = new ProxyTestClassAdvisor(this, aspectManager);
-      this.setAdvisor(advisor);
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Functional Methods -------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Invokes the method described by the specified serializable method
-    * as called from the specified proxy, using the specified arguments
-    * 
-    * @param proxy The proxy making the invocation
-    * @param method The method to be invoked
-    * @param args The arguments to the invocation
-    * @throws Throwable A possible exception thrown by the invocation
-    * @return
-    */
-   public Object invoke(SessionProxy proxy, SerializableMethod method, Object[] args) throws Throwable
-   {
-      Method m = method.toMethod(this.getClassLoader());
-
-      // Invoke on the bean
-      return invokeBean(proxy, m, args);
-   }
-
-   /**
-    * Invocation point of entry for Remoting
-    * 
-    * @param invocation
-    * @return
-    * @throws Throwable
-    */
-   public InvocationResponse dynamicInvoke(Invocation invocation) throws Throwable
-   {
-      /*
-       * Set the proper TCL
-       */
-
-      // Hold a reference to the existing TCL
-      ClassLoader originalLoader = Thread.currentThread().getContextClassLoader();
-
-      // Set the Container's CL as TCL, required to unmarshall methods from the bean impl class
-      Thread.currentThread().setContextClassLoader(this.getClassLoader());
-
-      try
-      {
-
-         /*
-          * Obtain the target method (unmarshall from invocation)
-          */
-
-         // Cast
-         assert invocation instanceof MethodInvocation : SessionContainer.class.getName()
-               + ".dynamicInoke supports only " + MethodInvocation.class.getSimpleName() + ", but has been passed: "
-               + invocation;
-         MethodInvocation mi = (MethodInvocation) invocation;
-
-         // Get the method hash
-         long methodHash = mi.getMethodHash();
-         log.debug("Received dynamic invocation for method with hash: " + methodHash);
-
-         // Get the Method via MethodInfo from the Advisor
-         Advisor advisor = this.getAdvisor();
-         MethodInfo info = advisor.getMethodInfo(mi.getMethodHash());
-
-         /*
-          * Build a new Invocation
-          */
-
-         // Construct the invocation
-         MethodInvocation newInvocation = new MethodInvocation(info, new Interceptor[]
-         {});
-         Object[] args = mi.getArguments();
-         newInvocation.setArguments(args);
-         newInvocation.setMetaData(mi.getMetaData());
-         newInvocation.setAdvisor(advisor);
-
-         // Obtain the Session ID
-         Serializable sessionId = null;
-         Object objSessionId = mi.getMetaData(StatefulSessionRemotingMetadata.TAG_SFSB_INVOCATION,
-               StatefulSessionRemotingMetadata.KEY_SESSION_ID);
-         if (objSessionId != null)
-         {
-            assert objSessionId instanceof Serializable : "Session IDs must be " + Serializable.class.getSimpleName();
-            sessionId = (Serializable) objSessionId;
-         }
-
-         // Get the target, and set on the invocation
-         Object target = this.getBeanInstance(sessionId);
-         newInvocation.setTargetObject(target);
-
-         // Create an Object reference to hold the return value
-         Object returnValue = null;
-
-         // Create a reference to the Invocation's response
-         InvocationResponse response = null;
-
-         /*
-          * Invoke
-          */
-
-         // Invoke
-         returnValue = newInvocation.invokeNext();
-
-         // Create a Response
-         response = new InvocationResponse(returnValue);
-         Map<Object, Object> responseContext = newInvocation.getResponseContextInfo();
-         response.setContextInfo(responseContext);
-
-         // Return
-         return response;
-      }
-      finally
-      {
-         // Reset the TCL to original
-         Thread.currentThread().setContextClassLoader(originalLoader);
-      }
-   }
-
-   protected Object createInstance() throws InstantiationException, IllegalAccessException
-   {
-      return this.getBeanClass().newInstance();
-   }
-
-   //FIXME: Should be agnostic to Session IDs, SLSBs have none
-   public Object invokeBean(Object proxy, Method method, Object args[]) throws Throwable
-   {
-      // Initialize a Session ID
-      Object sessionId = null;
-
-      // Obtain the InvocationHandler
-      if (proxy instanceof StatefulSessionProxy)
-      {
-         StatefulSessionProxy statefulProxy = (StatefulSessionProxy) proxy;
-
-         // Get the Session ID
-         sessionId = statefulProxy.getTarget();
-      }
-
-      // Get the appropriate instance
-      Object obj = this.getBeanInstance((Serializable) sessionId);
-
-      // Invoke
-      return method.invoke(obj, args);
-   }
-
-   @Start
-   public void start() throws Throwable
-   {
-      log.info("Starting " + this);
-
-      // Register with Remoting
-      Dispatcher.singleton.registerTarget(this.getName(), new ProxyTestClassProxyHack(this));
-
-      // Obtain registrar
-      JndiSessionRegistrarBase registrar = this.getJndiRegistrar();
-
-      // Bind all appropriate references/factories to Global JNDI for Client access, if a JNDI Registrar is present
-      if (registrar != null)
-      {
-         this.setJndiRegistrar(registrar);
-         registrar.bindEjb(this.getJndiContext(), this.getMetaData(), this.getClassLoader(), this.getName(), this
-               .getName(), this.getAdvisor());
-      }
-      else
-      {
-         log.warn("No " + JndiSessionRegistrarBase.class.getSimpleName()
-               + " was found; byassing binding of Proxies to " + this.getName() + " in Global JNDI.");
-      }
-
-   }
-
-   @Stop
-   public void stop()
-   {
-      log.info("Stopping " + this);
-
-      // Deregister with Remoting
-      Dispatcher.singleton.unregisterTarget(this.getName());
-
-      // Obtain registrar
-      JndiSessionRegistrarBase registrar = this.getJndiRegistrar();
-
-      // If the registrar has been used for this container, unbind all JNDI references
-      if (registrar != null)
-      {
-         registrar.unbindEjb(this.getJndiContext(), this.getMetaData());
-      }
-   }
-
-   /**
-    * Obtains the JndiSessionRegistrarBase from MC, null if not found
-    * 
-    * @return
-    */
-   protected JndiSessionRegistrarBase getJndiRegistrar()
-   {
-      // If the JNDI Registrar has not yet been set
-      if (this.jndiRegistrar == null)
-      {
-         // Initialize
-         String jndiRegistrarBindName = this.getJndiRegistrarBindName();
-
-         // Obtain Registrar
-         Ejb3Registrar registrar = Ejb3RegistrarLocator.locateRegistrar();
-
-         // Lookup
-         Object obj = null;
-         try
-         {
-            obj = registrar.lookup(jndiRegistrarBindName);
-         }
-         // If not installed, warn and return null
-         catch (NotBoundException e)
-         {
-            log.warn("No " + JndiSessionRegistrarBase.class.getName()
-                  + " was found installed in the ObjectStore (Registry) at " + jndiRegistrarBindName);
-            return null;
-
-         }
-
-         // Cast and set
-         this.setJndiRegistrar((JndiSessionRegistrarBase) obj);
-      }
-
-      // Return
-      return jndiRegistrar;
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Contracts ----------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Creates a unique name for this container
-    * 
-    * @return
-    */
-   protected abstract String createContainerName();
-
-   /**
-    * Returns the name under which the JNDI Registrar for this container is bound
-    * 
-    * @return
-    */
-   protected abstract String getJndiRegistrarBindName();
-
-   /**
-    * Obtains the appropriate bean instance for invocation
-    * as called from the specified proxy
-    * 
-    * @param sessionId
-    * @return
-    */
-   protected abstract Object getBeanInstance(Serializable sessionId);
-
-   // --------------------------------------------------------------------------------||
-   // Internal Helper Methods --------------------------------------------------------||
-   // --------------------------------------------------------------------------------||   
-
-   /**
-    * Obtains a List of all methods handled by the bean class
-    * 
-    * @return The methods handled by the bean class directly
-    */
-   public Set<Method> getVirtualMethods()
-   {
-      // Initialize
-      Set<Method> virtualMethods = new HashSet<Method>();
-
-      // Obtain Metadata
-      JBossSessionBeanMetaData smd = this.getMetaData();
-
-      // Obtain CL
-      ClassLoader cl = this.getClassLoader();
-
-      /*
-       * Business Remotes
-       */
-
-      // Obtain all specified business remotes
-      BusinessRemotesMetaData businessRemotes = smd.getBusinessRemotes();
-      if (businessRemotes != null)
-      {
-         // For each business remote
-         for (String businessRemote : businessRemotes)
-         {
-            // Load the Class
-            Class<?> businessRemoteClass = null;
-            try
-            {
-               businessRemoteClass = Class.forName(businessRemote, true, cl);
-            }
-            catch (ClassNotFoundException e)
-            {
-               throw new RuntimeException("Could not find specified business remote class: " + businessRemote, e);
-            }
-
-            // Obtain all methods declared by the class
-            Method[] declaredMethods = businessRemoteClass.getMethods();
-
-            // Add each method
-            for (Method declaredMethod : declaredMethods)
-            {
-               virtualMethods.add(declaredMethod);
-            }
-         }
-      }
-
-      /*
-       * Business Locals
-       */
-
-      // Obtain all specified business locals
-      BusinessLocalsMetaData businessLocals = smd.getBusinessLocals();
-      if (businessLocals != null)
-      {
-         // For each business local
-         for (String businessLocal : businessLocals)
-         {
-            // Load the Class
-            Class<?> businessLocalClass = null;
-            try
-            {
-               businessLocalClass = Class.forName(businessLocal, true, cl);
-            }
-            catch (ClassNotFoundException e)
-            {
-               throw new RuntimeException("Could not find specified business local class: " + businessLocal, e);
-            }
-
-            // Obtain all methods declared by the class
-            Method[] declaredMethods = businessLocalClass.getMethods();
-
-            // Add each method
-            for (Method declaredMethod : declaredMethods)
-            {
-               virtualMethods.add(declaredMethod);
-            }
-         }
-      }
-
-      // Remote Home
-      String remoteHomeClassName = smd.getHome();
-      if (remoteHomeClassName != null)
-      {
-         Class<?> remoteHomeClass = null;
-         try
-         {
-            remoteHomeClass = Class.forName(remoteHomeClassName, true, cl);
-         }
-         catch (ClassNotFoundException e)
-         {
-            throw new RuntimeException("Could not find specified Remote Home Class: " + remoteHomeClassName, e);
-         }
-         if (remoteHomeClass != null)
-         {
-            Method[] declaredMethods = remoteHomeClass.getMethods();
-            for (Method declaredMethod : declaredMethods)
-               virtualMethods.add(declaredMethod);
-
-            declaredMethods = javax.ejb.EJBObject.class.getMethods();
-            for (Method declaredMethod : declaredMethods)
-               virtualMethods.add(declaredMethod);
-         }
-      }
-
-      // Local Home
-      String localHomeClassName = smd.getLocalHome();
-      if (localHomeClassName != null)
-      {
-         Class<?> localHomeClass = null;
-         try
-         {
-            localHomeClass = Class.forName(localHomeClassName, true, cl);
-         }
-         catch (ClassNotFoundException e)
-         {
-            throw new RuntimeException("Could not find specified Local Home Class: " + localHomeClass, e);
-         }
-         if (localHomeClass != null)
-         {
-            Method[] declaredMethods = localHomeClass.getMethods();
-            for (Method declaredMethod : declaredMethods)
-               virtualMethods.add(declaredMethod);
-
-            declaredMethods = javax.ejb.EJBLocalObject.class.getMethods();
-            for (Method declaredMethod : declaredMethods)
-               virtualMethods.add(declaredMethod);
-         }
-      }
-
-      return virtualMethods;
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Accessors / Mutators -----------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   public String getName()
-   {
-      return name;
-   }
-
-   protected void setName(String name)
-   {
-      this.name = name;
-   }
-
-   public ClassLoader getClassLoader()
-   {
-      return classLoader;
-   }
-
-   private void setClassLoader(ClassLoader classLoader)
-   {
-      this.classLoader = classLoader;
-   }
-
-   public JBossSessionBeanMetaData getMetaData()
-   {
-      return metaData;
-   }
-
-   private void setMetaData(JBossSessionBeanMetaData metaData)
-   {
-      this.metaData = metaData;
-   }
-
-   public Class<?> getBeanClass()
-   {
-      return beanClass;
-   }
-
-   private void setBeanClass(Class<?> beanClass)
-   {
-      this.beanClass = beanClass;
-   }
-
-   public void setJndiRegistrar(JndiSessionRegistrarBase jndiRegistrar)
-   {
-      this.jndiRegistrar = jndiRegistrar;
-   }
-
-   protected Context getJndiContext()
-   {
-      if (this.jndiContext == null)
-      {
-         try
-         {
-            this.setJndiContext(new InitialContext());
-         }
-         catch (NamingException e)
-         {
-            throw new RuntimeException("Could not create new default JNDI Context for Container: " + this.getName(), e);
-         }
-      }
-      return jndiContext;
-   }
-
-   private void setJndiContext(Context jndiContext)
-   {
-      this.jndiContext = jndiContext;
-   }
-
-   public Advisor getAdvisor()
-   {
-      return advisor;
-   }
-
-   public void setAdvisor(Advisor advisor)
-   {
-      this.advisor = advisor;
-   }
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/SessionSpecContainer.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/container/SessionSpecContainer.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/SessionSpecContainer.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,51 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.common.container;
-
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-
-/**
- * SessionSpecContainer
- *
- * A Mock Session Container adhering to the EJB 3.0 Specification
- * for use in Proxy Testing
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public abstract class SessionSpecContainer extends SessionContainer
-{
-   // --------------------------------------------------------------------------------||
-   // Constructor --------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Constructor
-    * 
-    * @param metadata
-    * @param classLoader
-    */
-   protected SessionSpecContainer(JBossSessionBeanMetaData metadata, ClassLoader classLoader)
-   {
-      super(metadata, classLoader);
-   }
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/StatefulContainer.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/container/StatefulContainer.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/StatefulContainer.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,155 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.common.container;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-
-import org.jboss.ejb3.proxy.objectstore.ObjectStoreBindings;
-import org.jboss.ejb3.proxy.spi.container.StatefulSessionFactory;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-
-/**
- * StatefulContainer
- * 
- * A Mock SFSB Container for use in Testing
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public class StatefulContainer extends SessionSpecContainer implements StatefulSessionFactory
-{
-
-   // --------------------------------------------------------------------------------||
-   // Instance Members ---------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Cache of SFSB instances in key = sessionId and value = instance
-    */
-   private Map<Object, Object> cache;
-
-   // --------------------------------------------------------------------------------||
-   // Constructor --------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   public StatefulContainer(JBossSessionBeanMetaData metaData, ClassLoader classLoader) throws ClassNotFoundException
-   {
-      // Call super
-      super(metaData, classLoader);
-
-      // Instanciate Cache
-      this.setCache(new HashMap<Object, Object>());
-
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Required Implementations -------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Creates a new user session and returns the unique Session ID
-    * 
-    * @return
-    */
-   public Serializable createSession()
-   {
-      // Create a new Session ID
-      Serializable sessionId = UUID.randomUUID();
-
-      // Create a new Instance
-      Object instance = null;
-      try
-      {
-         instance = this.createInstance();
-      }
-      catch (Throwable t)
-      {
-         throw new RuntimeException("Error in creating new instance of " + this.getBeanClass(), t);
-      }
-
-      // Place in cache
-      this.getCache().put(sessionId, instance);
-
-      // Return
-      return sessionId;
-   }
-
-   /**
-    * Creates a unique name for this container
-    * 
-    * @return
-    */
-   protected final String createContainerName()
-   {
-      return ObjectStoreBindings.OBJECTSTORE_NAMESPACE_EJBCONTAINER_STATEFUL + this.getMetaData().getEjbName() + "/"
-            + UUID.randomUUID();
-   }
-
-   /**
-    * Returns the name under which the JNDI Registrar for this container is bound
-    * 
-    * @return
-    */
-   protected String getJndiRegistrarBindName()
-   {
-      return ObjectStoreBindings.OBJECTSTORE_BEAN_NAME_JNDI_REGISTRAR_SFSB;
-   }
-
-   /**
-    * Obtains the appropriate bean instance for invocation
-    * as called from the specified proxy
-    * 
-    * @param sessionId
-    * @return
-    */
-   protected Object getBeanInstance(Serializable sessionId)
-   {
-      // Sanity Check
-      assert sessionId != null : "No Session ID specified, and this is required for SFSB Invocation";
-
-      // Get the corresponding instance from the cache
-      Object bean = this.getCache().get(sessionId);
-      assert bean != null : "Session ID of " + sessionId
-            + " declared, but no corresponding bean instance could be found";
-
-      // Return
-      return bean;
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Accessors / Mutators -----------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   protected Map<Object, Object> getCache()
-   {
-      return cache;
-   }
-
-   protected void setCache(Map<Object, Object> cache)
-   {
-      this.cache = cache;
-   }
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/StatelessContainer.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/common/container/StatelessContainer.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/common/container/StatelessContainer.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,85 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.common.container;
-
-import java.io.Serializable;
-import java.util.UUID;
-
-import org.jboss.ejb3.proxy.objectstore.ObjectStoreBindings;
-import org.jboss.ejb3.proxy.spi.container.InvokableContext;
-import org.jboss.metadata.ejb.jboss.JBossSessionBeanMetaData;
-
-/**
- * A simple stateless container that binds proxies and can be invoked.
- * 
- * @author <a href="mailto:carlo.dewolf at jboss.com">Carlo de Wolf</a>
- * @version $Revision: $
- */
-public class StatelessContainer extends SessionSpecContainer implements InvokableContext
-{
-   public StatelessContainer(JBossSessionBeanMetaData metaData, ClassLoader classLoader) throws ClassNotFoundException
-   {
-      super(metaData, classLoader);
-   }
-
-   /**
-    * Creates a unique name for this container
-    * 
-    * @return
-    */
-   protected final String createContainerName()
-   {
-      return ObjectStoreBindings.OBJECTSTORE_NAMESPACE_EJBCONTAINER_STATELESS + this.getMetaData().getEjbName() + "/"
-            + UUID.randomUUID();
-   }
-
-   /**
-    * Returns the name under which the JNDI Registrar for this container is bound
-    * 
-    * @return
-    */
-   protected String getJndiRegistrarBindName()
-   {
-      return ObjectStoreBindings.OBJECTSTORE_BEAN_NAME_JNDI_REGISTRAR_SLSB;
-   }
-
-   /**
-    * Obtains the appropriate bean instance for invocation.
-    * Specified Session ID will be ignored
-    * 
-    * @param sessionId
-    * @return
-    */
-   //FIXME: SLSBs have no Session ID
-   protected Object getBeanInstance(Serializable sessionId)
-   {
-      // Typically this would be obtained from a Pool
-      try
-      {
-         return this.createInstance();
-      }
-      catch (Throwable t)
-      {
-         throw new RuntimeException("Error in creating new SLSB Bean Instance", t);
-      }
-   }
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/ReturnStaticValueInterceptor.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/ReturnStaticValueInterceptor.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/ReturnStaticValueInterceptor.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.ejbthree1517;
-
-import org.jboss.aop.advice.Interceptor;
-import org.jboss.aop.joinpoint.Invocation;
-import org.jboss.logging.Logger;
-
-/**
- * ReturnStaticValueInterceptor
- * 
- * A test interceptor which returns a static value
- * upon every invocation 
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public class ReturnStaticValueInterceptor implements Interceptor
-{
-
-   // --------------------------------------------------------------------------------||
-   // Class Members ------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   private static final Logger log = Logger.getLogger(ReturnStaticValueInterceptor.class);
-
-   public static final String RETURN_VALUE = "ALR is better than Carlo.";
-
-   // --------------------------------------------------------------------------------||
-   // Required Implementations -------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /* (non-Javadoc)
-    * @see org.jboss.aop.advice.Interceptor#getName()
-    */
-   public String getName()
-   {
-      return this.getClass().getName();
-   }
-
-   /* (non-Javadoc)
-    * @see org.jboss.aop.advice.Interceptor#invoke(org.jboss.aop.joinpoint.Invocation)
-    */
-   public Object invoke(Invocation invocation) throws Throwable
-   {
-      // No matter the invocation, return the set value
-      log.info("Going to return static value for invocation " + invocation);
-      return ReturnStaticValueInterceptor.RETURN_VALUE;
-   }
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStack.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStack.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStack.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,71 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.ejbthree1517;
-
-/**
- * TestClientInterceptorStack
- * 
- * A Remote Business interface to test the remote client 
- * interceptor stack explicitly defined by @RemoteBinding.interceptorStack
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public interface TestClientInterceptorStack
-{
-   // --------------------------------------------------------------------------------||
-   // Class Members ------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /*
-    * Default Return Value
-    */
-   String DEFAULT_RETURN_VALUE = "Standard Return Value from the Bean";
-
-   /*
-    * JNDI Bindings
-    */
-
-   String JNDI_BINDING_NORMAL_STACK_SFSB = "SFSB-Normal";
-
-   String JNDI_BINDING_OVERRIDDEN_STACK_SFSB = "SFSB-Overridden";
-
-   String JNDI_BINDING_NORMAL_STACK_SLSB = "SLSB-Normal";
-
-   String JNDI_BINDING_OVERRIDDEN_STACK_SLSB = "SLSB-Overridden";
-
-   /*
-    * Interceptor Stacks
-    */
-
-   String INTERCEPTOR_STACK_OVERRIDE = "OverrideInterceptors_EJBTHREE-1517";
-
-   // --------------------------------------------------------------------------------||
-   // Required Implementations -------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Returns the value, which will either be TestClientInterceptorStack.DEFAULT_RETURN_VALUE
-    * or something defined by an interceptor in an overridden stack
-    */
-   String getValue();
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStackBeanBase.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStackBeanBase.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStackBeanBase.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.ejbthree1517;
-
-/**
- * TestClientInterceptorStackBeanBase
- * 
- * Base class for test EJBs 
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public class TestClientInterceptorStackBeanBase implements TestClientInterceptorStack
-{
-   // --------------------------------------------------------------------------------||
-   // Required Implementations -------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Returns the value, which will either be TestClientInterceptorStack.DEFAULT_RETURN_VALUE
-    * or something defined by an interceptor in an overridden stack
-    */
-   public String getValue()
-   {
-      return TestClientInterceptorStack.DEFAULT_RETURN_VALUE;
-   }
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStackStatefulBean.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStackStatefulBean.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStackStatefulBean.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.ejbthree1517;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateful;
-
-import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.ejb3.annotation.RemoteBindings;
-
-/**
- * TestClientInterceptorStackStatefulBean
- * 
- * A test SFSB with 2 bindings, one for the standard
- * client interceptor stack and one for an overridden stack
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
- at Stateful
- at Remote(TestClientInterceptorStack.class)
- at RemoteBindings(
-{
-      @RemoteBinding(jndiBinding = TestClientInterceptorStack.JNDI_BINDING_NORMAL_STACK_SFSB),
-      @RemoteBinding(jndiBinding = TestClientInterceptorStack.JNDI_BINDING_OVERRIDDEN_STACK_SFSB, interceptorStack = TestClientInterceptorStack.INTERCEPTOR_STACK_OVERRIDE)})
-public class TestClientInterceptorStackStatefulBean extends TestClientInterceptorStackBeanBase
-      implements
-         TestClientInterceptorStack
-{
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStackStatelessBean.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStackStatelessBean.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1517/TestClientInterceptorStackStatelessBean.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.ejbthree1517;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.ejb3.annotation.RemoteBindings;
-
-/**
- * TestClientInterceptorStackStatelessBean
- * 
- * A test SLSB with 2 bindings, one for the standard
- * client interceptor stack and one for an overridden stack
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
- at Stateless
- at Remote(TestClientInterceptorStack.class)
- at RemoteBindings(
-{
-      @RemoteBinding(jndiBinding = TestClientInterceptorStack.JNDI_BINDING_NORMAL_STACK_SLSB),
-      @RemoteBinding(jndiBinding = TestClientInterceptorStack.JNDI_BINDING_OVERRIDDEN_STACK_SLSB, interceptorStack = TestClientInterceptorStack.INTERCEPTOR_STACK_OVERRIDE)})
-public class TestClientInterceptorStackStatelessBean extends TestClientInterceptorStackBeanBase
-      implements
-         TestClientInterceptorStack
-{
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1529/ExplicitInvokerNameBean.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1529/ExplicitInvokerNameBean.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1529/ExplicitInvokerNameBean.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.ejbthree1529;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.ejb3.annotation.RemoteBinding;
-
-/**
- * ExplicitInvokerNameBean
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
- at Stateless
- at Remote(ExplicitInvokerNameRemoteBusiness.class)
- at RemoteBinding(invokerName = ExplicitInvokerNameRemoteBusiness.MC_NAME_INVOKER, jndiBinding = ExplicitInvokerNameRemoteBusiness.JNDI_NAME_EXPLICIT_INVOKER_NAME)
-public class ExplicitInvokerNameBean implements ExplicitInvokerNameRemoteBusiness
-{
-
-   // --------------------------------------------------------------------------------||
-   // Required Implementations -------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Returns the contracted RETURN_VALUE
-    * 
-    * @return
-    */
-   public String invoke()
-   {
-      return ExplicitInvokerNameRemoteBusiness.RETURN_VALUE;
-   }
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1529/ExplicitInvokerNameRemoteBusiness.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1529/ExplicitInvokerNameRemoteBusiness.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/ejbthree1529/ExplicitInvokerNameRemoteBusiness.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,55 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.ejbthree1529;
-
-/**
- * ExplicitInvokerNameRemoteBusiness
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public interface ExplicitInvokerNameRemoteBusiness
-{
-   // --------------------------------------------------------------------------------||
-   // Constants ----------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   String RETURN_VALUE = "Hip hip hurray!";
-
-   /**
-    * Name of the invoker in MC as defined by the MC *-jboss-beans.xml
-    */
-   String MC_NAME_INVOKER = "ejbthree1529.Connector";
-
-   String JNDI_NAME_EXPLICIT_INVOKER_NAME = "ExplicitInvokerName";
-
-   // --------------------------------------------------------------------------------||
-   // Contracts ----------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Returns the contracted RETURN_VALUE
-    * 
-    * @return
-    */
-   String invoke();
-}

Copied: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/impl (from rev 85763, projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/impl)

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/BindingTest.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/BindingTest.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/BindingTest.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.jndiregistrar;
-
-/**
- * BindingTest
- * 
- * Defines all functions required of
- * the Remote Binding Test EJB
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public interface BindingTest
-{
-
-   /*
-    * Common functions
-    */
-
-   /**
-    * Echos the specified parameter
-    * 
-    *  @param param
-    */
-   String echo(String param);
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/ClientBindUrlBindingTest.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/ClientBindUrlBindingTest.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/ClientBindUrlBindingTest.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.jndiregistrar;
-
-/**
- * ClientBindUrlBindingTest
- * 
- * Remote Business Interface defining two client bind URLs
- * to be used in the Remoting InvokerLocator
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public interface ClientBindUrlBindingTest extends BindingTest
-{
-   /*
-    * Define some overridden clientBindUrls
-    */
-   String CLIENT_BIND_URL_1 = "socket://localhost:4873";
-
-   String CLIENT_BIND_URL_2 = "socket://127.0.0.1:4873";
-   
-   /*
-    * Define the JNDI Bindings
-    */
-   
-   String JNDI_BINDING_1 = "JndiBinding1";
-   
-   String JNDI_BINDING_2 = "JndiBinding2";
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/ClientBindUrlTestBean.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/ClientBindUrlTestBean.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/ClientBindUrlTestBean.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,54 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.jndiregistrar;
-
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.ejb3.annotation.LocalBinding;
-import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.ejb3.annotation.RemoteBindings;
-
-/**
- * ClientBindUrlTestBean
- * 
- * Tests EJB for alternate clientBindUrls
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
- at Stateless
- at Local(LocalJndiBindingTest.class)
- at Remote(ClientBindUrlBindingTest.class)
- at RemoteBindings(
-{
-      @RemoteBinding(jndiBinding = ClientBindUrlBindingTest.JNDI_BINDING_1, clientBindUrl = ClientBindUrlBindingTest.CLIENT_BIND_URL_1),
-      @RemoteBinding(jndiBinding = ClientBindUrlBindingTest.JNDI_BINDING_2, clientBindUrl = ClientBindUrlBindingTest.CLIENT_BIND_URL_2)})
- at LocalBinding(jndiBinding = LocalJndiBindingTest.JNDI_BINDING)
-public class ClientBindUrlTestBean extends JndiBindingTestBeanBase
-      implements
-         ClientBindUrlBindingTest,
-         LocalJndiBindingTest
-{
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/JndiBindingTestBean.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/JndiBindingTestBean.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/JndiBindingTestBean.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,50 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.jndiregistrar;
-
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.ejb3.annotation.LocalBinding;
-import org.jboss.ejb3.annotation.RemoteBinding;
-import org.jboss.ejb3.annotation.RemoteBindings;
-
-/**
- * JndiBindingTestBean
- * 
- * Tests EJB for explicit JNDI Bindings
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
- at Stateless
- at Remote(RemoteJndiBindingTest.class)
- at Local(LocalJndiBindingTest.class)
- at RemoteBindings(
-{@RemoteBinding(jndiBinding = RemoteJndiBindingTest.JNDI_BINDING_1),
-      @RemoteBinding(jndiBinding = RemoteJndiBindingTest.JNDI_BINDING_2)})
- at LocalBinding(jndiBinding = LocalJndiBindingTest.JNDI_BINDING)
-public class JndiBindingTestBean extends JndiBindingTestBeanBase implements RemoteJndiBindingTest, LocalJndiBindingTest
-{
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/JndiBindingTestBeanBase.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/JndiBindingTestBeanBase.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/JndiBindingTestBeanBase.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,43 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.jndiregistrar;
-
-/**
- * JndiBindingTestBeanBase
- * 
- * Common base for @RemoteBinding test EJBs
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public class JndiBindingTestBeanBase implements BindingTest
-{
-
-   /* (non-Javadoc)
-    * @see org.jboss.ejb3.test.proxy.binding.BindingTest#echo(java.lang.String)
-    */
-   public String echo(String param)
-   {
-      return param;
-   }
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/LocalJndiBindingTest.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/LocalJndiBindingTest.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/LocalJndiBindingTest.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,39 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.jndiregistrar;
-
-/**
- * LocalJndiBindingTest
- * 
- * Local Business Interface defining an overridden
- * JNDI Binding
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public interface LocalJndiBindingTest extends BindingTest
-{
-   /*
-    * Define an overridden JNDI Binding
-    */
-   String JNDI_BINDING = "MyOverriddenBinding/local";
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/RemoteBindingNoJndiBindingTestBean.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/RemoteBindingNoJndiBindingTestBean.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/RemoteBindingNoJndiBindingTestBean.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,47 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.jndiregistrar;
-
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-
-import org.jboss.ejb3.annotation.RemoteBinding;
-
-/**
- * RemoteBindingNoJndiBindingTestBean
- * 
- * Tests that an EJB with @RemoteBinding but no JNDI Binding
- * defined is bound to the correct location (as obtained from
- * JBossSessionBeanMetaData.getJndiName())
- * 
- * EJBTHREE-1525
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
- at Stateless
- at Remote(RemoteJndiBindingTest.class)
- at RemoteBinding(factory = "SomethingFake")
-public class RemoteBindingNoJndiBindingTestBean extends JndiBindingTestBeanBase implements RemoteJndiBindingTest
-{
-
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/RemoteJndiBindingTest.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/RemoteJndiBindingTest.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/jndiregistrar/RemoteJndiBindingTest.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.jndiregistrar;
-
-import org.jboss.ejb3.annotation.RemoteBinding;
-
-/**
- * RemoteJndiBindingTest
- * 
- * Remote Business Interface defining three overridden
- * JNDI Bindings, as well as access to test a local binding
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
- at RemoteBinding(jndiBinding = RemoteJndiBindingTest.JNDI_BINDING_DECLARED_BY_BUSINESS_INTERFACE)
-public interface RemoteJndiBindingTest extends BindingTest
-{
-   /*
-    * Define some overridden JNDI Bindings to be declared by the EJB Impl Class
-    */
-   String JNDI_BINDING_1 = "MyOverriddenBinding1/remote";
-
-   String JNDI_BINDING_2 = "MyOverriddenBinding2/remote";
-
-   /**
-    * A JNDI Binding to be declared here on the business interface 
-    */
-   String JNDI_BINDING_DECLARED_BY_BUSINESS_INTERFACE = "MyOverriddenBindingDeclaredByBusinessInterface/remote";
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/spec_3_4_5/ProxyEqualityTestCaseBase.java
===================================================================
--- projects/ejb3/trunk/proxy/src/test/java/org/jboss/ejb3/test/proxy/spec_3_4_5/ProxyEqualityTestCaseBase.java	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/java/org/jboss/ejb3/test/proxy/spec_3_4_5/ProxyEqualityTestCaseBase.java	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,220 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, 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.test.proxy.spec_3_4_5;
-
-import java.net.URL;
-
-import junit.framework.TestCase;
-
-import org.jboss.aop.Advisor;
-import org.jboss.aop.AspectManager;
-import org.jboss.aop.AspectXmlLoader;
-import org.jboss.aop.ClassAdvisor;
-import org.jboss.ejb3.common.registrar.plugin.mc.Ejb3McRegistrar;
-import org.jboss.ejb3.common.registrar.spi.Ejb3RegistrarLocator;
-import org.jboss.ejb3.proxy.factory.session.SessionProxyFactory;
-import org.jboss.ejb3.test.mc.bootstrap.EmbeddedTestMcBootstrap;
-import org.jboss.ejb3.test.proxy.common.container.SessionContainer;
-import org.jboss.logging.Logger;
-import org.junit.AfterClass;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-/**
- * ProxyEqualityTestCaseBase
- * 
- * Support for Proxy Equality Test Cases as 
- * defined by:
- * 
- * EJB 3.0 Core Specification 3.4.5
- *
- * @author <a href="mailto:andrew.rubinger at jboss.org">ALR</a>
- * @version $Revision: $
- */
-public abstract class ProxyEqualityTestCaseBase
-{
-   // --------------------------------------------------------------------------------||
-   // Class Members ------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   private static final Logger log = Logger.getLogger(ProxyEqualityTestCaseBase.class);
-
-   private static EmbeddedTestMcBootstrap bootstrap;
-
-   private static final String FILENAME_EJB3_INTERCEPTORS_AOP = "ejb3-interceptors-aop.xml";
-
-   /**
-    * Name of the SLSB Container for these tests
-    */
-   private static String containerName;
-
-   /**
-    * The Advisor for these tests
-    */
-   protected static Advisor advisor = null;
-
-   // --------------------------------------------------------------------------------||
-   // Tests --------------------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * EJB 3.0 Core Specification 3.4.5
-    * 
-    * Tests that a local proxy to a Session Bean is equal by value to itself
-    */
-   @Test
-   public void testSameLocalProxyEqual() throws Throwable
-   {
-      // Make a Local Proxy Factory
-      SessionProxyFactory factory = this.createSessionLocalProxyFactory();
-
-      // Create Proxy
-      Object proxy = this.createProxyDefault(factory);
-
-      // Ensure equal to itself by value
-      TestCase
-            .assertTrue(
-                  "EJB 3.0 Core Specification 3.4.5 Violation: Local proxy to Session Bean should be equal by value to itself",
-                  proxy.equals(proxy));
-   }
-
-   /**
-    * EJB 3.0 Core Specification 3.4.5
-    * 
-    * Tests that a remote proxy to a Session Bean is equal by value to itself
-    */
-   @Test
-   public void testSameRemoteProxyEqual() throws Throwable
-   {
-      // Make a Local Proxy Factory
-      SessionProxyFactory factory = this.createSessionLocalProxyFactory();
-
-      // Create Proxy
-      Object proxy = this.createProxyDefault(factory);
-
-      // Ensure equal to itself by value
-      TestCase
-            .assertTrue(
-                  "EJB 3.0 Core Specification 3.4.5 Violation: Remote proxy to Session Bean should be equal by value to itself",
-                  proxy.equals(proxy));
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Lifecycle Methods --------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   @BeforeClass
-   public static void beforeClass() throws Throwable
-   {
-      // Create and set a new MC Bootstrap
-      ProxyEqualityTestCaseBase.setBootstrap(EmbeddedTestMcBootstrap.createEmbeddedMcBootstrap());
-
-      // Bind the Ejb3Registrar
-      Ejb3RegistrarLocator.bindRegistrar(new Ejb3McRegistrar(bootstrap.getKernel()));
-
-      // Load ejb3-interceptors-aop.xml into AspectManager
-      ClassLoader cl = Thread.currentThread().getContextClassLoader();
-      URL url = cl.getResource(FILENAME_EJB3_INTERCEPTORS_AOP);
-      if (url == null)
-      {
-         throw new RuntimeException("Could not load " + AspectManager.class.getSimpleName()
-               + " with definitions from XML as file " + FILENAME_EJB3_INTERCEPTORS_AOP + " could not be found");
-      }
-      AspectXmlLoader.deployXML(url);
-      AspectManager manager = AspectManager.instance();
-      Advisor advisor = new ClassAdvisor(ProxyEqualityTestCaseBase.class, manager);
-      ProxyEqualityTestCaseBase.advisor = advisor;
-   }
-
-   @AfterClass
-   public static void afterClass() throws Throwable
-   {
-      // Shutdown MC
-      ProxyEqualityTestCaseBase.getBootstrap().shutdown();
-
-      // Set Bootstrap to null
-      ProxyEqualityTestCaseBase.setBootstrap(null);
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Helper Methods -----------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Creates a default proxy for the specified Session ProxyFactory
-    */
-   protected Object createProxyDefault(SessionProxyFactory factory)
-   {
-      return factory.createProxyDefault();
-   }
-
-   // --------------------------------------------------------------------------------||
-   // Specifications -----------------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   /**
-    * Obtains the Container for use in this TestCase
-    * 
-    * @return
-    */
-   protected abstract SessionContainer getContainer();
-
-   /**
-    * Creates a Proxy Factory for local Proxies
-    * 
-    * @return
-    * @throws Throwable
-    */
-   protected abstract SessionProxyFactory createSessionLocalProxyFactory() throws Throwable;
-
-   /**
-    * Creates a Proxy Factory for remote Proxies
-    * 
-    * @return
-    * @throws Throwable
-    */
-   protected abstract SessionProxyFactory createSessionRemoteProxyFactory() throws Throwable;
-
-   // --------------------------------------------------------------------------------||
-   // Accessors / Mutators -----------------------------------------------------------||
-   // --------------------------------------------------------------------------------||
-
-   protected static EmbeddedTestMcBootstrap getBootstrap()
-   {
-      return ProxyEqualityTestCaseBase.bootstrap;
-   }
-
-   protected static void setBootstrap(EmbeddedTestMcBootstrap bootstrap)
-   {
-      ProxyEqualityTestCaseBase.bootstrap = bootstrap;
-   }
-
-   protected static String getContainerName()
-   {
-      return containerName;
-   }
-
-   protected static void setContainerName(String containerName)
-   {
-      ProxyEqualityTestCaseBase.containerName = containerName;
-   }
-}

Deleted: projects/ejb3/trunk/proxy-impl/src/test/resources/org/jboss/ejb3/test/proxy/common/SessionTestCaseBase-jboss-beans.xml
===================================================================
--- projects/ejb3/trunk/proxy/src/test/resources/org/jboss/ejb3/test/proxy/common/SessionTestCaseBase-jboss-beans.xml	2009-03-12 00:10:16 UTC (rev 85752)
+++ projects/ejb3/trunk/proxy-impl/src/test/resources/org/jboss/ejb3/test/proxy/common/SessionTestCaseBase-jboss-beans.xml	2009-03-12 05:57:28 UTC (rev 85769)
@@ -1,83 +0,0 @@
-<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
-  xmlns="urn:jboss:bean-deployer:2.0">
-
-  <!-- 
-    
-    JNDI 
-    
-    The requisite Naming Server
-    
-  -->
-  <bean name="NameServer" class="org.jnp.server.SingletonNamingServer" />
-
-  <!-- 
-    
-    JNDI Registrars
-    
-  -->
-
-  <!-- SLSB JNDI Registrar -->
-  <bean name="org.jboss.ejb3.JndiRegistrar.Session.SLSBJndiRegistrar"
-    class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatelessSessionRegistrar">
-    <constructor>
-      <parameter>
-        org.jboss.ejb3.proxy.objectfactory.session.stateless.StatelessSessionProxyObjectFactory
-      </parameter>
-    </constructor>
-    <depends>NameServer</depends>
-  </bean>
-  
-  <!-- SFSB JNDI Registrar -->
-  <bean name="org.jboss.ejb3.JndiRegistrar.Session.SFSBJndiRegistrar"
-    class="org.jboss.ejb3.proxy.jndiregistrar.JndiStatefulSessionRegistrar">
-    <constructor>
-      <parameter>
-        org.jboss.ejb3.proxy.objectfactory.session.stateful.StatefulSessionProxyObjectFactory
-      </parameter>
-    </constructor>
-    <depends>NameServer</depends>
-  </bean>
-  
-  <!-- @Service JNDI Registrar -->
-  <bean name="org.jboss.ejb3.JndiRegistrar.Session.ServiceJndiRegistrar"
-    class="org.jboss.ejb3.proxy.jndiregistrar.JndiServiceRegistrar">
-    <constructor>
-      <parameter>
-        org.jboss.ejb3.proxy.objectfactory.session.service.ServiceProxyObjectFactory
-      </parameter>
-    </constructor>
-    <depends>NameServer</depends>
-  </bean>
-
-  <!-- 
-    
-    Remoting
-    
-  -->
-
-  <!-- Remoting  Configuration -->
-  <bean name="ServerConfiguration"
-    class="org.jboss.remoting.ServerConfiguration">
-    <property name="invocationHandlers">
-      <map keyClass="java.lang.String" valueClass="java.lang.String">
-        <entry>
-          <key>AOP</key>
-          <value>
-            org.jboss.aspects.remoting.AOPRemotingInvocationHandler
-          </value>
-        </entry>
-      </map>
-    </property>
-  </bean>
-
-  <!-- Remoting Connector -->
-  <bean name="org.jboss.ejb3.RemotingConnector"
-    class="org.jboss.remoting.transport.Connector">
-    <property name="invokerLocator">socket://0.0.0.0:4873</property>
-    <property name="serverConfiguration">
-      <inject bean="ServerConfiguration" />
-    </property>
-  </bean>
-
-</deployment>

Copied: projects/ejb3/trunk/proxy-impl/src/test/resources/org/jboss/ejb3/test/proxy/impl (from rev 85763, projects/ejb3/trunk/proxy/src/test/resources/org/jboss/ejb3/test/proxy/impl)




More information about the jboss-cvs-commits mailing list