Author: rmannibucau
Date: Fri Mar 21 18:40:42 2014
New Revision: 1580008
URL: http://svn.apache.org/r1580008
Log:
what happen? reverting to keep test working as expected
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/resources/openejb.json
Modified:
tomee/tomee/trunk/container/openejb-core/src/test/resources/openejb.json
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/resources/openejb.json?rev=1580008&r1=1580007&r2=1580008&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/test/resources/openejb.json
(original)
+++ tomee/tomee/trunk/container/openejb-core/src/test/resources/openejb.json
Fri Mar 21 18:40:42 2014
@@ -1,14 +1,54 @@
{
- "resources":{
- "Orange":{
- "type":"org.superbiz.foo.Orange",
- "className":"org.superbiz.foo.Orange",
- "classpath":"%s",
- "properties":{
- "red":"FF",
- "green":"99",
- "blue":"00"
+ "__": [
+ "comments are supported through __ key",
+ "so don't hesitate to explain what you are configuring"
+ ],
+ "resources": {
+ "__": [
+ "here is",
+ "the resources configuration"
+ ],
+ "json-datasource": {
+ "__": [
+ "properties is the magic attribute",
+ "to configure the resource"
+ ],
+ "properties": {
+ "JdbcUrl": "jdbc:hsqldb:mem:json",
+ "MaxActive": 123,
+ "JtaManaged": false
+ }
+ }
+ },
+ "deployments": {
+ "apps": {
+ "dir": "apps"
+ }
+ },
+ "containers": {
+ "stateless": {
+ "type": "STATELESS",
+ "properties": {
+ "AccessTimeout": "10 seconds"
+ }
+ }
+ },
+ "system-properties": {
+ "a": "b",
+ "c": "d",
+ "e": {
+ "f": "g",
+ "h": {
+ "i": "j"
+ }
+ },
+ "placeholder": "${JSonConfigTest.foo}",
+ "properties-key" = "properties-value",
+ "object" = {
+ "attribute" = {
+ "#1" = "2"
}
}
}
}
+
