[jboss-cvs] JBossAS SVN: r66800 - in branches/JBPAPP_4_2_0_GA_CP/ejb3: src/test/org/jboss/ejb3/test and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: bdecoste
Date: 2007-11-06 17:44:21 -0500 (Tue, 06 Nov 2007)
New Revision: 66800

Removed:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/timestampentity/
Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
   branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
Log:
[JBAS-4938] removed proprietary code

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2007-11-06 22:05:34 UTC (rev 66799)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2007-11-06 22:44:21 UTC (rev 66800)
@@ -2232,23 +2232,6 @@
       </jar>
    </target>
    
-    <target name="timestampentity"
-      description="Builds all jar files."
-      depends="compile-classes">
-
-      <mkdir dir="${build.lib}"/>
-
-      <jar jarfile="${build.lib}/timestampentity-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/timestampentity/*.class"/>
-            <include name="org/jboss/ejb3/test/timestampentity/entity/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/timestampentity">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
-   
    <target name="mdbtransactions"
       description="Builds all jar files."
       depends="compile-classes">
@@ -3332,7 +3315,7 @@
 	  </copy>
    </target>
    
-   <target name="jars" depends="removedislocal, statelesscreation, defaultremotebindings, localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, invalidtxmdb, descriptortypo, libdeployment, homeinterface, timestampentity, servicexmbean, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader, 
+   <target name="jars" depends="removedislocal, statelesscreation, defaultremotebindings, localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, invalidtxmdb, descriptortypo, libdeployment, homeinterface, servicexmbean, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader, 
       circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ear, ejbthree440, 
       ejbthree454, ejbthree653, ejbthree670, ejbthree712, ejbthree724, ejbthree751, ejbthree832, ejbthree921,
       ejbthree959, ejbthree963, ejbthree994,

Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java	2007-11-06 22:05:34 UTC (rev 66799)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/src/test/org/jboss/ejb3/test/invoker/unit/InvokerTestCase.java	2007-11-06 22:44:21 UTC (rev 66800)
@@ -48,12 +48,12 @@
  
    public void testHttp() throws Exception
    {
-      Properties props = new Properties();
-      props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory"); 
-      props.put("java.naming.provider.url", "http://localhost:8080/invoker/JNDIFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
-      InitialContext jndiContext = new InitialContext(props);
-      //InitialContext jndiContext = new InitialContext();
+ //     Properties props = new Properties();
+ //     props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory"); 
+ //     props.put("java.naming.provider.url", "http://localhost:8080/invoker/JNDIFactory");
+ //     props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
+ //     InitialContext jndiContext = new InitialContext(props);
+      InitialContext jndiContext = new InitialContext();
       
       StatelessRemote stateless = (StatelessRemote)jndiContext.lookup("StatelessHttp");
       assertNotNull(stateless);
@@ -65,12 +65,12 @@
    {
 	   setHostNameVerifier();
 	  
-      Properties props = new Properties();
-      props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory"); 
-      props.put("java.naming.provider.url", "http://localhost:8080/invoker/JNDIFactory");
-      props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
-      InitialContext jndiContext = new InitialContext(props);
-      //InitialContext jndiContext = new InitialContext();
+ //     Properties props = new Properties();
+ //     props.put("java.naming.factory.initial", "org.jboss.naming.HttpNamingContextFactory"); 
+ //     props.put("java.naming.provider.url", "http://localhost:8080/invoker/JNDIFactory");
+ //     props.put("java.naming.factory.url.pkgs", "org.jboss.naming");
+ //     InitialContext jndiContext = new InitialContext(props);
+      InitialContext jndiContext = new InitialContext();
       
       StatelessRemote stateless = (StatelessRemote)jndiContext.lookup("StatelessHttps");
       assertNotNull(stateless);