You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/06/10 08:50:15 UTC
svn commit: r1491349 - in
/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config:
DeploymentLoader.java ReadDescriptors.java
Author: rmannibucau
Date: Mon Jun 10 06:50:14 2013
New Revision: 1491349
URL: http://svn.apache.org/r1491349
Log:
TOMEE-966 supporting resources.json deployment
Modified:
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1491349&r1=1491348&r2=1491349&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java Mon Jun 10 06:50:14 2013
@@ -1678,7 +1678,7 @@ public class DeploymentLoader implements
path = path.substring(0, path.length() - 1);
}
- if (path.endsWith(".xml")) { // let say it is a resource module
+ if (path.endsWith(".xml") || path.endsWith(".json")) { // let say it is a resource module
return ResourcesModule.class;
}
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java?rev=1491349&r1=1491348&r2=1491349&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/config/ReadDescriptors.java Mon Jun 10 06:50:14 2013
@@ -275,7 +275,7 @@ public class ReadDescriptors implements
}
}
}
- {
+ { // json
final Source url = getSource(module.getAltDDs().get("resources.json"));
if (url != null) {
try {