You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2012/02/16 15:30:01 UTC
svn commit: r1244997 - in /openejb/trunk/openejb/tomee: tomee-loader/
tomee-loader/src/main/java/org/apache/tomee/loader/dto/
tomee-loader/src/main/java/org/apache/tomee/loader/ws/
tomee-plus-webapp/src/main/webapp/WEB-INF/ tomee-webapp/src/main/webapp...
Author: tveronezi
Date: Thu Feb 16 14:30:00 2012
New Revision: 1244997
URL: http://svn.apache.org/viewvc?rev=1244997&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-130
Preparing the java code for the new web interface.
new rest url.
Added:
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/dto/
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/dto/JndiDTO.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/ws/
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/ws/JndiWs.java
Modified:
openejb/trunk/openejb/tomee/tomee-loader/pom.xml
openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
Modified: openejb/trunk/openejb/tomee/tomee-loader/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/pom.xml?rev=1244997&r1=1244996&r2=1244997&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/pom.xml Thu Feb 16 14:30:00 2012
@@ -36,6 +36,12 @@
<version>${openejb.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.openejb</groupId>
+ <artifactId>javaee-api</artifactId>
+ <version>6.0-3-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.tomcat</groupId>
<artifactId>tomcat-catalina</artifactId>
<version>${tomcat.version}</version>
Added: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/dto/JndiDTO.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/dto/JndiDTO.java?rev=1244997&view=auto
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/dto/JndiDTO.java (added)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/dto/JndiDTO.java Thu Feb 16 14:30:00 2012
@@ -0,0 +1,11 @@
+package org.apache.tomee.loader.dto;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "jndi")
+public class JndiDTO {
+
+ public String module;
+ public String name;
+ public String value;
+}
Added: openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/ws/JndiWs.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/ws/JndiWs.java?rev=1244997&view=auto
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/ws/JndiWs.java (added)
+++ openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/ws/JndiWs.java Thu Feb 16 14:30:00 2012
@@ -0,0 +1,77 @@
+package org.apache.tomee.loader.ws;
+
+
+import org.apache.openejb.AppContext;
+import org.apache.openejb.loader.SystemInstance;
+import org.apache.openejb.spi.ContainerSystem;
+import org.apache.tomee.loader.dto.JndiDTO;
+
+import javax.naming.Context;
+import javax.naming.NameClassPair;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import java.util.ArrayList;
+import java.util.List;
+
+@Path("/ws/jndi")
+@Produces({"application/json"})
+public class JndiWs {
+
+ @Path("/names")
+ @GET
+ public List<JndiDTO> get() throws NamingException {
+ List<JndiDTO> result = new ArrayList<JndiDTO>();
+ List<Object> objects = new ArrayList<Object>();
+
+
+ final ContainerSystem containerSystem = SystemInstance.get().getComponent(ContainerSystem.class);
+
+ mountJndiList(result, containerSystem.getJNDIContext(), "containerSystem", "java:global");
+
+ List<AppContext> appCtxs = containerSystem.getAppContexts();
+ for (AppContext appContext : appCtxs) {
+ final Context ctx = appContext.getAppJndiContext();
+ mountJndiList(result, ctx, appContext.getId(), "java:comp");
+ mountJndiList(result, ctx, appContext.getId(), "java:app");
+ }
+
+ return result;
+ }
+
+
+ private void mountJndiList(List<JndiDTO> jndi, Context context, String id, String root) throws NamingException {
+ final NamingEnumeration namingEnumeration;
+ try {
+ namingEnumeration = context.list(root);
+ } catch (NamingException e) {
+ //not found?
+ return;
+ }
+ while (namingEnumeration.hasMoreElements()) {
+ final NameClassPair pair = (NameClassPair) namingEnumeration.next();
+ final String key = root + "/" + pair.getName();
+ final Object obj;
+ try {
+ obj = context.lookup(key);
+ } catch (NamingException e) {
+ //not found?
+ continue;
+ }
+
+ if (Context.class.isInstance(obj)) {
+ mountJndiList(jndi, Context.class.cast(obj), id, key);
+ } else {
+ JndiDTO dto = new JndiDTO();
+ dto.module = id;
+ dto.name = key;
+ dto.value = String.valueOf(obj);
+ jndi.add(dto);
+ }
+ }
+
+ }
+
+}
Modified: openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml?rev=1244997&r1=1244996&r2=1244997&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml Thu Feb 16 14:30:00 2012
@@ -16,11 +16,10 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
-
-<web-app>
+<web-app 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/web-app_3_0.xsd"
+ version="3.0">
<display-name>OpenEJB Loader Application</display-name>
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml?rev=1244997&r1=1244996&r2=1244997&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml Thu Feb 16 14:30:00 2012
@@ -16,11 +16,11 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!DOCTYPE web-app
- PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
- "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app 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/web-app_3_0.xsd"
+ version="3.0">
-<web-app>
<display-name>OpenEJB Loader Application</display-name>