You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2012/01/11 20:57:18 UTC

svn commit: r802416 - in /websites/production/openejb: ./ content/ content/examples-trunk/applicationexception/ content/examples-trunk/ear-testing/ content/examples-trunk/helloworld-weblogic/ content/examples-trunk/interceptors/ content/examples-trunk/...

Author: dblevins
Date: Wed Jan 11 19:57:17 2012
New Revision: 802416

Log:
Publishing merge to openejb site by dblevins

Added:
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/pom.xml
      - copied unchanged from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/pom.xml
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/main/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/main/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/main/java/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/main/java/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/main/java/org/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/main/java/org/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/main/java/org/superbiz/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/main/java/org/superbiz/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/main/java/org/superbiz/calculator/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/main/java/org/superbiz/calculator/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/main/java/org/superbiz/calculator/Calculator.java
      - copied unchanged from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/main/java/org/superbiz/calculator/Calculator.java
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/main/resources/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/main/resources/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/main/resources/META-INF/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/main/resources/META-INF/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/main/resources/META-INF/ejb-jar.xml
      - copied unchanged from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/main/resources/META-INF/ejb-jar.xml
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/test/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/test/java/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/java/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/test/java/org/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/java/org/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/test/java/org/superbiz/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/java/org/superbiz/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java
      - copied unchanged from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/java/org/superbiz/calculator/CalculatorTest.java
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/test/resources/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/resources/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/test/resources/META-INF/
      - copied from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/resources/META-INF/
    websites/production/openejb/content/examples-trunk/simple-webservice-without-interface/src/test/resources/META-INF/ejb-jar.xml
      - copied unchanged from r802415, websites/staging/openejb/trunk/content/examples-trunk/simple-webservice-without-interface/src/test/resources/META-INF/ejb-jar.xml
Modified:
    websites/production/openejb/   (props changed)
    websites/production/openejb/content/examples-trunk/applicationexception/README.html
    websites/production/openejb/content/examples-trunk/ear-testing/README.html
    websites/production/openejb/content/examples-trunk/helloworld-weblogic/README.html
    websites/production/openejb/content/examples-trunk/interceptors/README.html
    websites/production/openejb/content/examples-trunk/quartz-app/README.html
    websites/production/openejb/content/examples-trunk/simple-cmp2/README.html
    websites/production/openejb/content/examples-trunk/simple-stateless-with-descriptor/README.html
    websites/production/openejb/content/examples-trunk/simple-webservice/README.html
    websites/production/openejb/content/examples-trunk/spring-integration/README.html
    websites/production/openejb/content/examples-trunk/spring-integration/src/main/resources/movies.xml
    websites/production/openejb/content/examples-trunk/telephone-stateful/README.html
    websites/production/openejb/content/examples-trunk/testing-security-2/README.html
    websites/production/openejb/content/examples-trunk/webapps/moviefun/README.html
    websites/production/openejb/content/examples-trunk/webapps/struts/README.html
    websites/production/openejb/content/examples-trunk/webservice-attachments/README.html
    websites/production/openejb/content/examples-trunk/webservice-inheritance/README.html
    websites/production/openejb/content/examples-trunk/webservice-security/README.html
    websites/production/openejb/content/examples-trunk/webservice-ws-security/README.html
    websites/production/openejb/content/index.html

Propchange: websites/production/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 11 19:57:17 2012
@@ -1 +1 @@
-/websites/staging/openejb/trunk:790824-802213
+/websites/staging/openejb/trunk:790824-802415

Modified: websites/production/openejb/content/examples-trunk/applicationexception/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/applicationexception/README.html (original)
+++ websites/production/openejb/content/examples-trunk/applicationexception/README.html Wed Jan 11 19:57:17 2012
@@ -133,7 +133,7 @@ public class ThrowBusinessExceptionImplT
     @Before
     public void setUp() throws Exception {
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
 
         initialContext = new InitialContext(properties);
     }

Modified: websites/production/openejb/content/examples-trunk/ear-testing/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/ear-testing/README.html (original)
+++ websites/production/openejb/content/examples-trunk/ear-testing/README.html Wed Jan 11 19:57:17 2012
@@ -227,7 +227,7 @@ ear-testing/pom.xml
 
     public void test() throws Exception {
         Properties p = new Properties();
-        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
 
         p.put("openejb.deployments.classpath.ear", "true");
 

Modified: websites/production/openejb/content/examples-trunk/helloworld-weblogic/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/helloworld-weblogic/README.html (original)
+++ websites/production/openejb/content/examples-trunk/helloworld-weblogic/README.html Wed Jan 11 19:57:17 2012
@@ -166,7 +166,7 @@ public class HelloTest extends TestCase 
 
     public void test() throws Exception {
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         InitialContext initialContext = new InitialContext(properties);
 
         HelloEjbLocalHome localHome = (HelloEjbLocalHome) initialContext.lookup("MyHello");

Modified: websites/production/openejb/content/examples-trunk/interceptors/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/interceptors/README.html (original)
+++ websites/production/openejb/content/examples-trunk/interceptors/README.html Wed Jan 11 19:57:17 2012
@@ -584,7 +584,7 @@ public class FullyInterceptedTest extend
     @Before
     public void setUp() throws Exception {
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
 
         initCtx = new InitialContext(properties);
@@ -664,7 +664,7 @@ public class MethodLevelInterceptorOnlyT
     @Before
     public void setUp() throws Exception {
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
 
         initCtx = new InitialContext(properties);
@@ -710,7 +710,7 @@ public class SecondStatelessInterceptedT
     @Before
     public void setUp() throws Exception {
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
 
         initCtx = new InitialContext(properties);
@@ -760,7 +760,7 @@ public class ThirdSLSBeanTest extends Te
     @Before
     public void setUp() throws Exception {
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         properties.setProperty("openejb.deployments.classpath.include", ".*interceptors/target/classes.*");
 
         initCtx = new InitialContext(properties);

Modified: websites/production/openejb/content/examples-trunk/quartz-app/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/quartz-app/README.html (original)
+++ websites/production/openejb/content/examples-trunk/quartz-app/README.html Wed Jan 11 19:57:17 2012
@@ -238,7 +238,7 @@ public class QuartzMdbTest {
 
         if (null == initialContext) {
             Properties properties = new Properties();
-            properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+            properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
 
             initialContext = new InitialContext(properties);
         }

Modified: websites/production/openejb/content/examples-trunk/simple-cmp2/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/simple-cmp2/README.html (original)
+++ websites/production/openejb/content/examples-trunk/simple-cmp2/README.html Wed Jan 11 19:57:17 2012
@@ -249,7 +249,7 @@ public class MoviesTest extends TestCase
 
     public void test() throws Exception {
         Properties p = new Properties();
-        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         p.put("movieDatabase", "new://Resource?type=DataSource");
         p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
         p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");

Modified: websites/production/openejb/content/examples-trunk/simple-stateless-with-descriptor/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/simple-stateless-with-descriptor/README.html (original)
+++ websites/production/openejb/content/examples-trunk/simple-stateless-with-descriptor/README.html Wed Jan 11 19:57:17 2012
@@ -180,7 +180,7 @@ public class CalculatorTest extends Test
 
     protected void setUp() throws Exception {
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
 
         initialContext = new InitialContext(properties);
     }

Modified: websites/production/openejb/content/examples-trunk/simple-webservice/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/simple-webservice/README.html (original)
+++ websites/production/openejb/content/examples-trunk/simple-webservice/README.html Wed Jan 11 19:57:17 2012
@@ -275,7 +275,7 @@ public class CalculatorTest extends Test
 
     protected void setUp() throws Exception {
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         properties.setProperty("openejb.embedded.remotable", "true");
 
         initialContext = new InitialContext(properties);

Modified: websites/production/openejb/content/examples-trunk/spring-integration/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/spring-integration/README.html (original)
+++ websites/production/openejb/content/examples-trunk/spring-integration/README.html Wed Jan 11 19:57:17 2012
@@ -409,7 +409,7 @@ public class Theaters {
 
   <!--
   Loads the EJBs from the classpath just as when embedding OpenEJB via
-  the org.apache.openejb.localclient.LocalInitialContextFactory.  All the discovered
+  the org.apache.openejb.core.LocalInitialContextFactory.  All the discovered
   EJBs are imported into this context and available for injection here.
   -->
   <bean name="classPathApplication" class="org.apache.openejb.spring.ClassPathApplication"/>

Modified: websites/production/openejb/content/examples-trunk/spring-integration/src/main/resources/movies.xml
==============================================================================
--- websites/production/openejb/content/examples-trunk/spring-integration/src/main/resources/movies.xml (original)
+++ websites/production/openejb/content/examples-trunk/spring-integration/src/main/resources/movies.xml Wed Jan 11 19:57:17 2012
@@ -54,7 +54,7 @@
 
   <!--
   Loads the EJBs from the classpath just as when embedding OpenEJB via
-  the org.apache.openejb.localclient.LocalInitialContextFactory.  All the discovered
+  the org.apache.openejb.core.LocalInitialContextFactory.  All the discovered
   EJBs are imported into this context and available for injection here.
   -->
   <bean name="classPathApplication" class="org.apache.openejb.spring.ClassPathApplication"/>

Modified: websites/production/openejb/content/examples-trunk/telephone-stateful/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/telephone-stateful/README.html (original)
+++ websites/production/openejb/content/examples-trunk/telephone-stateful/README.html Wed Jan 11 19:57:17 2012
@@ -187,7 +187,7 @@ public class TelephoneTest extends TestC
 
     protected void setUp() throws Exception {
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         properties.setProperty("openejb.embedded.remotable", "true");
         // Uncomment these properties to change the defaults
         //properties.setProperty("ejbd.port", "4202");
@@ -207,7 +207,7 @@ public class TelephoneTest extends TestC
     public void testTalkOverLocalNetwork() throws Exception {
 
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         InitialContext localContext = new InitialContext(properties);
 
         Telephone telephone = (Telephone) localContext.lookup("TelephoneBeanRemote");

Modified: websites/production/openejb/content/examples-trunk/testing-security-2/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/testing-security-2/README.html (original)
+++ websites/production/openejb/content/examples-trunk/testing-security-2/README.html Wed Jan 11 19:57:17 2012
@@ -226,7 +226,7 @@ public class MovieTest extends TestCase 
 
     public void testAsManager() throws Exception {
         Properties p = new Properties();
-        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         p.put(Context.SECURITY_PRINCIPAL, "jane");
         p.put(Context.SECURITY_CREDENTIALS, "waterfall");
 
@@ -252,7 +252,7 @@ public class MovieTest extends TestCase 
 
     public void testAsEmployee() throws Exception {
         Properties p = new Properties();
-        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         p.put(Context.SECURITY_PRINCIPAL, "joe");
         p.put(Context.SECURITY_CREDENTIALS, "cool");
 

Modified: websites/production/openejb/content/examples-trunk/webapps/moviefun/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/webapps/moviefun/README.html (original)
+++ websites/production/openejb/content/examples-trunk/webapps/moviefun/README.html Wed Jan 11 19:57:17 2012
@@ -954,7 +954,7 @@ public class MoviesTest extends TestCase
 
     public void setUp() throws Exception {
         Properties p = new Properties();
-        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         p.put("movieDatabase", "new://Resource?type=DataSource");
         p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
         p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");

Modified: websites/production/openejb/content/examples-trunk/webapps/struts/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/webapps/struts/README.html (original)
+++ websites/production/openejb/content/examples-trunk/webapps/struts/README.html Wed Jan 11 19:57:17 2012
@@ -139,7 +139,7 @@ public class AddUser {
             UserService service = null;
             Properties props = new Properties();
             props.put(Context.INITIAL_CONTEXT_FACTORY,
-                    "org.apache.openejb.localclient.LocalInitialContextFactory");
+                    "org.apache.openejb.core.LocalInitialContextFactory");
             Context ctx = new InitialContext(props);
             service = (UserService) ctx.lookup("UserServiceImplLocal");
             service.add(new User(id, firstName, lastName));
@@ -208,7 +208,7 @@ public class FindUser {
             UserService service = null;
             Properties props = new Properties();
             props.put(Context.INITIAL_CONTEXT_FACTORY,
-                    "org.apache.openejb.localclient.LocalInitialContextFactory");
+                    "org.apache.openejb.core.LocalInitialContextFactory");
             Context ctx = new InitialContext(props);
             service = (UserService) ctx.lookup("UserServiceImplLocal");
             this.user = service.find(id);
@@ -278,7 +278,7 @@ public class ListAllUsers {
             UserService service = null;
             Properties props = new Properties();
             props.put(Context.INITIAL_CONTEXT_FACTORY,
-                    "org.apache.openejb.localclient.LocalInitialContextFactory");
+                    "org.apache.openejb.core.LocalInitialContextFactory");
             Context ctx = new InitialContext(props);
             service = (UserService) ctx.lookup("UserServiceImplLocal");
             this.users = service.findAll();

Modified: websites/production/openejb/content/examples-trunk/webservice-attachments/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/webservice-attachments/README.html (original)
+++ websites/production/openejb/content/examples-trunk/webservice-attachments/README.html Wed Jan 11 19:57:17 2012
@@ -196,7 +196,7 @@ public class AttachmentTest extends Test
     protected void setUp() throws Exception {
 
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         properties.setProperty("openejb.embedded.remotable", "true");
 
         initialContext = new InitialContext(properties);

Modified: websites/production/openejb/content/examples-trunk/webservice-inheritance/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/webservice-inheritance/README.html (original)
+++ websites/production/openejb/content/examples-trunk/webservice-inheritance/README.html Wed Jan 11 19:57:17 2012
@@ -334,7 +334,7 @@ public class InheritanceTest extends Tes
     protected void setUp() throws Exception {
 
         Properties p = new Properties();
-        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         p.put("wakeBoardDatabase", "new://Resource?type=DataSource");
         p.put("wakeBoardDatabase.JdbcDriver", "org.hsqldb.jdbcDriver");
         p.put("wakeBoardDatabase.JdbcUrl", "jdbc:hsqldb:mem:wakeBoarddb");

Modified: websites/production/openejb/content/examples-trunk/webservice-security/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/webservice-security/README.html (original)
+++ websites/production/openejb/content/examples-trunk/webservice-security/README.html Wed Jan 11 19:57:17 2012
@@ -201,7 +201,7 @@ public class CalculatorTest extends Test
 
     protected void setUp() throws Exception {
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         properties.setProperty("openejb.embedded.remotable", "true");
 
         initialContext = new InitialContext(properties);

Modified: websites/production/openejb/content/examples-trunk/webservice-ws-security/README.html
==============================================================================
--- websites/production/openejb/content/examples-trunk/webservice-ws-security/README.html (original)
+++ websites/production/openejb/content/examples-trunk/webservice-ws-security/README.html Wed Jan 11 19:57:17 2012
@@ -400,7 +400,7 @@ public class CalculatorTest extends Test
     //START SNIPPET: setup
     protected void setUp() throws Exception {
         Properties properties = new Properties();
-        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory");
+        properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.core.LocalInitialContextFactory");
         properties.setProperty("openejb.embedded.remotable", "true");
 
         new InitialContext(properties);

Modified: websites/production/openejb/content/index.html
==============================================================================
--- websites/production/openejb/content/index.html (original)
+++ websites/production/openejb/content/index.html Wed Jan 11 19:57:17 2012
@@ -79,12 +79,12 @@
     <div class="row">
       <div class="span6">
         <h2>TomEE+</h2>
-        <p>TomEE Plus has all the features of TomEE with the addition of JAX-RS, JAX-WS, JMS and the Java Connector Architecture.  The additional functionality is delivered via Apache CXF, Apache ActiveMQ and the Geronimo Connector library</p>
+        <p>Apache TomEE Plus has all the features of TomEE with the addition of JAX-RS, JAX-WS, JMS and the Java Connector Architecture.  The additional functionality is delivered via Apache CXF, Apache ActiveMQ and the Geronimo Connector library</p>
         <p><a class="btn" href="apache-tomee.html">View details &raquo;</a></p>
       </div>
       <div class="span5">
         <h2>OpenEJB</h2>
-         <p>Don't be mislead by the name, OpenEJB contains a lot more than EJB.  A better description might be "headless TomEE+" as it contains everything TomEE+ contains minus Servlets, JSP and JSF.</p>
+         <p>Don't be mislead by the name, Apache OpenEJB contains a lot more than EJB.  A better description might be "headless TomEE+" as it contains everything TomEE+ contains minus Servlets, JSP and JSF.</p>
         <p><a class="btn" href="#">View details &raquo;</a></p>
      </div>
       <div class="span5">