Return-Path: X-Original-To: apmail-openejb-commits-archive@www.apache.org Delivered-To: apmail-openejb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 474BE9964 for ; Tue, 21 Feb 2012 01:24:46 +0000 (UTC) Received: (qmail 44205 invoked by uid 500); 21 Feb 2012 01:24:46 -0000 Delivered-To: apmail-openejb-commits-archive@openejb.apache.org Received: (qmail 44187 invoked by uid 500); 21 Feb 2012 01:24:46 -0000 Mailing-List: contact commits-help@openejb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@openejb.apache.org Delivered-To: mailing list commits@openejb.apache.org Received: (qmail 44180 invoked by uid 99); 21 Feb 2012 01:24:46 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2012 01:24:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Feb 2012 01:24:43 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 43907238890D for ; Tue, 21 Feb 2012 01:24:22 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1291544 - /openejb/site/trunk/content/embedded-configuration.mdtext Date: Tue, 21 Feb 2012 01:24:22 -0000 To: commits@openejb.apache.org From: dblevins@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120221012422.43907238890D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dblevins Date: Tue Feb 21 01:24:21 2012 New Revision: 1291544 URL: http://svn.apache.org/viewvc?rev=1291544&view=rev Log: LInk updates. Thanks to Andrew Hughes for pointing it out! Modified: openejb/site/trunk/content/embedded-configuration.mdtext Modified: openejb/site/trunk/content/embedded-configuration.mdtext URL: http://svn.apache.org/viewvc/openejb/site/trunk/content/embedded-configuration.mdtext?rev=1291544&r1=1291543&r2=1291544&view=diff ============================================================================== --- openejb/site/trunk/content/embedded-configuration.mdtext (original) +++ openejb/site/trunk/content/embedded-configuration.mdtext Tue Feb 21 01:24:21 2012 @@ -2,7 +2,7 @@ Title: Embedded Configuration # Defaults, Overrides and Order -When booting up OpenEJB for testing via the LocalInitialContextFactory +When booting up OpenEJB for testing via the `LocalInitialContextFactory` there is quite a bit of flexibility to how things are configured. OpenEJB will function fine with no configuration at all and will happily @@ -22,8 +22,8 @@ It opens up some interesting possibiliti environment. You could do 100% of your configuration in your test case via InitialContext propertes, or you could do say 80% in a jndi.properties file or openejb.xml file and 20% in your test case via InitialContext -properties. You can put 100% of your configuration in a jndi.properties or -openejb.xml file and override them via InitialContext properties. +properties. You can put 100% of your configuration in a `jndi.properties` or +`openejb.xml` file and override them via `InitialContext` properties. You can manage the properties how you wish and there is no need for redundant definitions if you do not want them. @@ -33,18 +33,15 @@ redundant definitions if you do not want Everything you can configure via an openejb.xml (minus the element) can be configured/overridden via properties. See [Configuring Containers in Tests](configuring-containers-in-tests.html) - and [Configuring DataSources in Tests] -. + and [Configuring DataSources in Tests](configuring-datasources-in-tests.html). Everything in your logging.properties can be configured/overridden via -properties. See [Configuring Logging in Tests](configuring-logging-in-tests.html) -. +properties. See [Configuring Logging in Tests](configuring-logging-in-tests.html). The properties of persistence units declared in a persistence.xml can be -configured/overridden via properties. See [Configuring PersistenceUnits in Tests](configuring-persistenceunits-in-tests.html) -. +configured/overridden via properties. See [Configuring PersistenceUnits in Tests](configuring-persistenceunits-in-tests.html). -OpenEJB has many flags that can also be set as properties. See [OpenEJB Properties](openejb-properties.html) +OpenEJB has many flags that can also be set as properties. See [OpenEJB Properties](properties-listing.html) for details on those. @@ -54,8 +51,7 @@ OpenEJB has many flags that can also be Properties p = new Properties(); // set the initial context factory - p.put("java.naming.factory.initial ", " -org.apache.openejb.client.LocalInitialContextFactory"); + p.put("java.naming.factory.initial ", "org.apache.openejb.client.LocalInitialContextFactory"); // change some logging p.put("log4j.category.OpenEJB.options ", " debug"); @@ -68,8 +64,7 @@ org.apache.openejb.client.LocalInitialCo p.put("movieDatabase.JdbcUrl ", " jdbc:hsqldb:mem:moviedb"); // override properties on your "movie-unit" persistence unit - p.put("movie-unit.hibernate.dialect ", " -org.hibernate.dialect.HSQLDialect"); + p.put("movie-unit.hibernate.dialect ", "org.hibernate.dialect.HSQLDialect"); // set some openejb flags p.put("openejb.jndiname.format ", " {ejbName}/{interfaceClass}"); @@ -109,7 +104,7 @@ the root of any of the paths in the clas openejb.validation.output.level = verbose -Then OpenEJB can be booted via the InitialContext as normal. Properties +Then OpenEJB can be booted via the `InitialContext` as normal. Properties can still be used to override any of the above properties: