Modified: openejb/trunk/openejb/examples/webapps/moviefun/README.md URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/moviefun/README.md?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webapps/moviefun/README.md (original) +++ openejb/trunk/openejb/examples/webapps/moviefun/README.md Thu Dec 22 09:23:14 2011 @@ -872,7 +872,7 @@ Title: Moviefun public void setUp() throws Exception { Properties p = new Properties(); - p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory"); + p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory"); p.put("movieDatabase", "new://Resource?type=DataSource"); p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver"); p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb");
Modified: openejb/trunk/openejb/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java (original) +++ openejb/trunk/openejb/examples/webapps/moviefun/app/src/test/java/org/superbiz/moviefun/MoviesTest.java Thu Dec 22 09:23:14 2011 @@ -43,7 +43,7 @@ public class MoviesTest extends TestCase public void setUp() throws Exception { Properties p = new Properties(); - p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory"); + p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory"); p.put("movieDatabase", "new://Resource?type=DataSource"); p.put("movieDatabase.JdbcDriver", "org.hsqldb.jdbcDriver"); p.put("movieDatabase.JdbcUrl", "jdbc:hsqldb:mem:moviedb"); Modified: openejb/trunk/openejb/examples/webapps/moviefun/monitor/src/main/resources/jndi.properties URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/moviefun/monitor/src/main/resources/jndi.properties?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webapps/moviefun/monitor/src/main/resources/jndi.properties (original) +++ openejb/trunk/openejb/examples/webapps/moviefun/monitor/src/main/resources/jndi.properties Thu Dec 22 09:23:14 2011 @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -java.naming.factory.initial=org.apache.openejb.client.LocalInitialContextFactory +java.naming.factory.initial=org.apache.openejb.localclient.LocalInitialContextFactory Default\ JMS\ Resource\ Adapter=new://Resource?type=ActiveMQResourceAdapter Default\ JMS\ Resource\ Adapter.BrokerXmlConfig=broker:vm://localhost Default\ JMS\ Resource\ Adapter.ServerUrl=tcp://localhost:61616 Modified: openejb/trunk/openejb/examples/webapps/struts/README.md URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/struts/README.md?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webapps/struts/README.md (original) +++ openejb/trunk/openejb/examples/webapps/struts/README.md Thu Dec 22 09:23:14 2011 @@ -57,7 +57,7 @@ Title: Struts UserService service = null; Properties props = new Properties(); props.put(Context.INITIAL_CONTEXT_FACTORY, - "org.apache.openejb.client.LocalInitialContextFactory"); + "org.apache.openejb.localclient.LocalInitialContextFactory"); Context ctx = new InitialContext(props); service = (UserService) ctx.lookup("UserServiceImplLocal"); service.add(new User(id, firstName, lastName)); @@ -124,7 +124,7 @@ Title: Struts UserService service = null; Properties props = new Properties(); props.put(Context.INITIAL_CONTEXT_FACTORY, - "org.apache.openejb.client.LocalInitialContextFactory"); + "org.apache.openejb.localclient.LocalInitialContextFactory"); Context ctx = new InitialContext(props); service = (UserService) ctx.lookup("UserServiceImplLocal"); this.user = service.find(id); @@ -192,7 +192,7 @@ Title: Struts UserService service = null; Properties props = new Properties(); props.put(Context.INITIAL_CONTEXT_FACTORY, - "org.apache.openejb.client.LocalInitialContextFactory"); + "org.apache.openejb.localclient.LocalInitialContextFactory"); Context ctx = new InitialContext(props); service = (UserService) ctx.lookup("UserServiceImplLocal"); this.users = service.findAll(); Modified: openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/AddUser.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/AddUser.java?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/AddUser.java (original) +++ openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/AddUser.java Thu Dec 22 09:23:14 2011 @@ -68,7 +68,7 @@ public class AddUser { UserService service = null; Properties props = new Properties(); props.put(Context.INITIAL_CONTEXT_FACTORY, - "org.apache.openejb.client.LocalInitialContextFactory"); + "org.apache.openejb.localclient.LocalInitialContextFactory"); Context ctx = new InitialContext(props); service = (UserService) ctx.lookup("UserServiceImplLocal"); service.add(new User(id, firstName, lastName)); Modified: openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/FindUser.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/FindUser.java?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/FindUser.java (original) +++ openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/FindUser.java Thu Dec 22 09:23:14 2011 @@ -57,7 +57,7 @@ public class FindUser { UserService service = null; Properties props = new Properties(); props.put(Context.INITIAL_CONTEXT_FACTORY, - "org.apache.openejb.client.LocalInitialContextFactory"); + "org.apache.openejb.localclient.LocalInitialContextFactory"); Context ctx = new InitialContext(props); service = (UserService) ctx.lookup("UserServiceImplLocal"); this.user = service.find(id); Modified: openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/ListAllUsers.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/ListAllUsers.java?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/ListAllUsers.java (original) +++ openejb/trunk/openejb/examples/webapps/struts/src/main/java/org/superbiz/struts/ListAllUsers.java Thu Dec 22 09:23:14 2011 @@ -58,7 +58,7 @@ public class ListAllUsers { UserService service = null; Properties props = new Properties(); props.put(Context.INITIAL_CONTEXT_FACTORY, - "org.apache.openejb.client.LocalInitialContextFactory"); + "org.apache.openejb.localclient.LocalInitialContextFactory"); Context ctx = new InitialContext(props); service = (UserService) ctx.lookup("UserServiceImplLocal"); this.users = service.findAll(); Modified: openejb/trunk/openejb/examples/webservice-attachments/README.md URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-attachments/README.md?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webservice-attachments/README.md (original) +++ openejb/trunk/openejb/examples/webservice-attachments/README.md Thu Dec 22 09:23:14 2011 @@ -111,7 +111,7 @@ Title: Webservice Attachments protected void setUp() throws Exception { Properties properties = new Properties(); - properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory"); + properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory"); properties.setProperty("openejb.embedded.remotable", "true"); initialContext = new InitialContext(properties); Modified: openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java (original) +++ openejb/trunk/openejb/examples/webservice-attachments/src/test/java/org/superbiz/attachment/AttachmentTest.java Thu Dec 22 09:23:14 2011 @@ -38,7 +38,7 @@ public class AttachmentTest extends Test protected void setUp() throws Exception { Properties properties = new Properties(); - properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory"); + properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory"); properties.setProperty("openejb.embedded.remotable", "true"); initialContext = new InitialContext(properties); Modified: openejb/trunk/openejb/examples/webservice-inheritance/README.md URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-inheritance/README.md?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webservice-inheritance/README.md (original) +++ openejb/trunk/openejb/examples/webservice-inheritance/README.md Thu Dec 22 09:23:14 2011 @@ -4,111 +4,111 @@ Title: Webservice Inheritance ## Item - package org.superbiz.inheritance; - - import javax.persistence.Entity; - import javax.persistence.GeneratedValue; - import javax.persistence.GenerationType; - import javax.persistence.Id; - import javax.persistence.Inheritance; - import javax.persistence.InheritanceType; - import java.io.Serializable; - - @Entity - @Inheritance(strategy = InheritanceType.JOINED) - public class Item implements Serializable { - @Id - @GeneratedValue(strategy = GenerationType.AUTO) - private Long id; - private String brand; - private String itemName; - private double price; - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getBrand() { - return brand; - } - - public void setBrand(String brand) { - this.brand = brand; - } - - public String getItemName() { - return itemName; - } - - public void setItemName(String itemName) { - this.itemName = itemName; - } - - public double getPrice() { - return price; - } - - public void setPrice(double price) { - this.price = price; - } + package org.superbiz.inheritance; + + import javax.persistence.Entity; + import javax.persistence.GeneratedValue; + import javax.persistence.GenerationType; + import javax.persistence.Id; + import javax.persistence.Inheritance; + import javax.persistence.InheritanceType; + import java.io.Serializable; + + @Entity + @Inheritance(strategy = InheritanceType.JOINED) + public class Item implements Serializable { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + private String brand; + private String itemName; + private double price; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getBrand() { + return brand; + } + + public void setBrand(String brand) { + this.brand = brand; + } + + public String getItemName() { + return itemName; + } + + public void setItemName(String itemName) { + this.itemName = itemName; + } + + public double getPrice() { + return price; + } + + public void setPrice(double price) { + this.price = price; + } } ## Tower - package org.superbiz.inheritance; - - import javax.persistence.Entity; - - @Entity - public class Tower extends Item { - private Fit fit; - private String tubing; - - public static enum Fit { - Custom, Exact, Universal - } - - public Fit getFit() { - return fit; - } - - public void setFit(Fit fit) { - this.fit = fit; - } - - public String getTubing() { - return tubing; - } - - public void setTubing(String tubing) { - this.tubing = tubing; - } - - ; + package org.superbiz.inheritance; + + import javax.persistence.Entity; + + @Entity + public class Tower extends Item { + private Fit fit; + private String tubing; + + public static enum Fit { + Custom, Exact, Universal + } + + public Fit getFit() { + return fit; + } + + public void setFit(Fit fit) { + this.fit = fit; + } + + public String getTubing() { + return tubing; + } + + public void setTubing(String tubing) { + this.tubing = tubing; + } + + ; } ## Wakeboard - package org.superbiz.inheritance; - - import javax.persistence.Entity; - - @Entity - public class Wakeboard extends Wearable { + package org.superbiz.inheritance; + + import javax.persistence.Entity; + + @Entity + public class Wakeboard extends Wearable { } ## WakeboardBinding - package org.superbiz.inheritance; - - import javax.persistence.Entity; - - @Entity - public class WakeboardBinding extends Wearable { + package org.superbiz.inheritance; + + import javax.persistence.Entity; + + @Entity + public class WakeboardBinding extends Wearable { } ## WakeRiderImpl @@ -177,21 +177,21 @@ Title: Webservice Inheritance ## Wearable - package org.superbiz.inheritance; - - import javax.persistence.MappedSuperclass; - - @MappedSuperclass - public abstract class Wearable extends Item { - protected String size; - - public String getSize() { - return size; - } - - public void setSize(String size) { - this.size = size; - } + package org.superbiz.inheritance; + + import javax.persistence.MappedSuperclass; + + @MappedSuperclass + public abstract class Wearable extends Item { + protected String size; + + public String getSize() { + return size; + } + + public void setSize(String size) { + this.size = size; + } } ## ejb-jar.xml @@ -244,7 +244,7 @@ Title: Webservice Inheritance protected void setUp() throws Exception { Properties p = new Properties(); - p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory"); + p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory"); p.put("wakeBoardDatabase", "new://Resource?type=DataSource"); p.put("wakeBoardDatabase.JdbcDriver", "org.hsqldb.jdbcDriver"); p.put("wakeBoardDatabase.JdbcUrl", "jdbc:hsqldb:mem:wakeBoarddb"); Modified: openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java (original) +++ openejb/trunk/openejb/examples/webservice-inheritance/src/test/java/org/superbiz/inheritance/InheritanceTest.java Thu Dec 22 09:23:14 2011 @@ -35,7 +35,7 @@ public class InheritanceTest extends Tes protected void setUp() throws Exception { Properties p = new Properties(); - p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory"); + p.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory"); p.put("wakeBoardDatabase", "new://Resource?type=DataSource"); p.put("wakeBoardDatabase.JdbcDriver", "org.hsqldb.jdbcDriver"); p.put("wakeBoardDatabase.JdbcUrl", "jdbc:hsqldb:mem:wakeBoarddb"); Modified: openejb/trunk/openejb/examples/webservice-security/README.md URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-security/README.md?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webservice-security/README.md (original) +++ openejb/trunk/openejb/examples/webservice-security/README.md Thu Dec 22 09:23:14 2011 @@ -114,7 +114,7 @@ Title: Webservice Security protected void setUp() throws Exception { Properties properties = new Properties(); - properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory"); + properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory"); properties.setProperty("openejb.embedded.remotable", "true"); initialContext = new InitialContext(properties); Modified: openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java (original) +++ openejb/trunk/openejb/examples/webservice-security/src/test/java/org/superbiz/calculator/CalculatorTest.java Thu Dec 22 09:23:14 2011 @@ -33,7 +33,7 @@ public class CalculatorTest extends Test protected void setUp() throws Exception { Properties properties = new Properties(); - properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory"); + properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory"); properties.setProperty("openejb.embedded.remotable", "true"); initialContext = new InitialContext(properties); Modified: openejb/trunk/openejb/examples/webservice-ws-security/README.md URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-ws-security/README.md?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webservice-ws-security/README.md (original) +++ openejb/trunk/openejb/examples/webservice-ws-security/README.md Thu Dec 22 09:23:14 2011 @@ -75,87 +75,87 @@ Title: Webservice Ws Security ## ejb-jar.xml - <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; - version="3.0" id="simple" metadata-complete="false"> - - <enterprise-beans> - - <session> - <ejb-name>CalculatorImplTimestamp1way</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplTimestamp2ways</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplUsernameTokenPlainPassword</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplUsernameTokenHashedPassword</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplUsernameTokenPlainPasswordEncrypt</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplSign</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplEncrypt2ways</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplSign2ways</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - <session> - <ejb-name>CalculatorImplEncryptAndSign2ways</ejb-name> - <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> - <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> - <session-type>Stateless</session-type> - <transaction-type>Container</transaction-type> - </session> - - </enterprise-beans> - - </ejb-jar> + <ejb-jar xmlns="http://java.sun.com/xml/ns/javaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd"; + version="3.0" id="simple" metadata-complete="false"> + + <enterprise-beans> + + <session> + <ejb-name>CalculatorImplTimestamp1way</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplTimestamp2ways</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplUsernameTokenPlainPassword</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplUsernameTokenHashedPassword</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplUsernameTokenPlainPasswordEncrypt</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplSign</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplEncrypt2ways</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplSign2ways</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + <session> + <ejb-name>CalculatorImplEncryptAndSign2ways</ejb-name> + <service-endpoint>org.superbiz.calculator.CalculatorWs</service-endpoint> + <ejb-class>org.superbiz.calculator.CalculatorImpl</ejb-class> + <session-type>Stateless</session-type> + <transaction-type>Container</transaction-type> + </session> + + </enterprise-beans> + + </ejb-jar> ## openejb-jar.xml @@ -228,56 +228,56 @@ Title: Webservice Ws Security ## webservices.xml - <webservices xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee - http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"; - xmlns:ger="http://ciaows.org/wsdl"; version="1.1"> - - <webservice-description> - <webservice-description-name>CalculatorWsService</webservice-description-name> - <port-component> - <port-component-name>CalculatorImplTimestamp1way</port-component-name> - <wsdl-port>CalculatorImplTimestamp1way</wsdl-port> - <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> - <service-impl-bean> - <ejb-link>CalculatorImplTimestamp1way</ejb-link> - </service-impl-bean> - </port-component> - <port-component> - <port-component-name>CalculatorImplTimestamp2ways</port-component-name> - <wsdl-port>CalculatorImplTimestamp2ways</wsdl-port> - <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> - <service-impl-bean> - <ejb-link>CalculatorImplTimestamp2ways</ejb-link> - </service-impl-bean> - </port-component> - <port-component> - <port-component-name>CalculatorImplUsernameTokenPlainPassword</port-component-name> - <wsdl-port>CalculatorImplUsernameTokenPlainPassword</wsdl-port> - <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> - <service-impl-bean> - <ejb-link>CalculatorImplUsernameTokenPlainPassword</ejb-link> - </service-impl-bean> - </port-component> - <port-component> - <port-component-name>CalculatorImplUsernameTokenHashedPassword</port-component-name> - <wsdl-port>CalculatorImplUsernameTokenHashedPassword</wsdl-port> - <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> - <service-impl-bean> - <ejb-link>CalculatorImplUsernameTokenHashedPassword</ejb-link> - </service-impl-bean> - </port-component> - <port-component> - <port-component-name>CalculatorImplUsernameTokenPlainPasswordEncrypt</port-component-name> - <wsdl-port>CalculatorImplUsernameTokenPlainPasswordEncrypt</wsdl-port> - <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> - <service-impl-bean> - <ejb-link>CalculatorImplUsernameTokenPlainPasswordEncrypt</ejb-link> - </service-impl-bean> - </port-component> - </webservice-description> - - </webservices> + <webservices xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee + http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"; + xmlns:ger="http://ciaows.org/wsdl"; version="1.1"> + + <webservice-description> + <webservice-description-name>CalculatorWsService</webservice-description-name> + <port-component> + <port-component-name>CalculatorImplTimestamp1way</port-component-name> + <wsdl-port>CalculatorImplTimestamp1way</wsdl-port> + <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> + <service-impl-bean> + <ejb-link>CalculatorImplTimestamp1way</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>CalculatorImplTimestamp2ways</port-component-name> + <wsdl-port>CalculatorImplTimestamp2ways</wsdl-port> + <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> + <service-impl-bean> + <ejb-link>CalculatorImplTimestamp2ways</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>CalculatorImplUsernameTokenPlainPassword</port-component-name> + <wsdl-port>CalculatorImplUsernameTokenPlainPassword</wsdl-port> + <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> + <service-impl-bean> + <ejb-link>CalculatorImplUsernameTokenPlainPassword</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>CalculatorImplUsernameTokenHashedPassword</port-component-name> + <wsdl-port>CalculatorImplUsernameTokenHashedPassword</wsdl-port> + <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> + <service-impl-bean> + <ejb-link>CalculatorImplUsernameTokenHashedPassword</ejb-link> + </service-impl-bean> + </port-component> + <port-component> + <port-component-name>CalculatorImplUsernameTokenPlainPasswordEncrypt</port-component-name> + <wsdl-port>CalculatorImplUsernameTokenPlainPasswordEncrypt</wsdl-port> + <service-endpoint-interface>org.superbiz.calculator.CalculatorWs</service-endpoint-interface> + <service-impl-bean> + <ejb-link>CalculatorImplUsernameTokenPlainPasswordEncrypt</ejb-link> + </service-impl-bean> + </port-component> + </webservice-description> + + </webservices> ## CalculatorTest @@ -315,7 +315,7 @@ Title: Webservice Ws Security //START SNIPPET: setup protected void setUp() throws Exception { Properties properties = new Properties(); - properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory"); + properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory"); properties.setProperty("openejb.embedded.remotable", "true"); new InitialContext(properties); Modified: openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java (original) +++ openejb/trunk/openejb/examples/webservice-ws-security/src/test/java/org/superbiz/calculator/CalculatorTest.java Thu Dec 22 09:23:14 2011 @@ -47,7 +47,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.client.LocalInitialContextFactory"); + properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory"); properties.setProperty("openejb.embedded.remotable", "true"); new InitialContext(properties); Modified: openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java (original) +++ openejb/trunk/openejb/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/IvmTestServer.java Thu Dec 22 09:23:14 2011 @@ -34,7 +34,7 @@ public class IvmTestServer implements Te properties = props; try{ - props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory"); + props.put(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory"); Properties p = new Properties(); p.putAll(props); p.put("openejb.loader", "embed"); Modified: openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java (original) +++ openejb/trunk/openejb/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CxfJaxWsProviderTest.java Thu Dec 22 09:23:14 2011 @@ -41,7 +41,7 @@ public class CxfJaxWsProviderTest extend protected void setUp() throws Exception { Properties properties = new Properties(); - properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory"); + properties.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.localclient.LocalInitialContextFactory"); properties.setProperty("openejb.embedded.remotable", "true"); initialContext = new InitialContext(properties); Modified: openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java?rev=1222119&r1=1222118&r2=1222119&view=diff ============================================================================== --- openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java (original) +++ openejb/trunk/openejb/server/openejb-ejbd/src/test/java/org/apache/openejb/server/ejbd/UberInterfaceTest.java Thu Dec 22 09:23:14 2011 @@ -99,7 +99,7 @@ public class UberInterfaceTest extends T { // local invoke Properties props = new Properties(); - props.put("java.naming.factory.initial", "org.apache.openejb.client.LocalInitialContextFactory"); + props.put("java.naming.factory.initial", "org.apache.openejb.localclient.LocalInitialContextFactory"); Context context = new InitialContext(props); Everything local = (Everything) context.lookup("SuperBeanLocal");
