Author: tveronezi
Date: Wed May 30 13:33:52 2012
New Revision: 1344252
URL: http://svn.apache.org/viewvc?rev=1344252&view=rev
Log:
https://issues.apache.org/jira/browse/TOMEE-205
Added:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiHelper.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiHelper.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiHelperImpl.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiHelperImpl.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiTreeHelperImpl.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiTreeHelperImpl.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/OpenEJBHelper.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/OpenEJBHelper.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/OpenEJBHelperImpl.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/OpenEJBHelperImpl.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceContext.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceContext.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceContextImpl.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceContextImpl.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceException.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceException.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TestHelper.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TestHelper.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TestHelperImpl.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TestHelperImpl.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TypeAndValueEntry.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TypeAndValueEntry.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/listener/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/listener/UserSessionListener.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/UserSessionListener.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/ConsoleServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/JndiServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/TestServlet.java
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/TestServlet.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/css/tomee.css
- copied, changed from r1344005,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/css/bootstrap.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/img/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/img/glyphicons-halflings-white.png
(with props)
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/img/glyphicons-halflings.png
(with props)
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/bootstrap/bootstrap.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/Application.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/Application.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationChannel.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationChannel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationController.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationI18N.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationI18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/ApplicationModel.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationModel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/model/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/model/JndiModel.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/JndiModel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/model/TestModel.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/TestModel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/DelayedTask.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/util/DelayedTask.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/util/Sequence.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/util/Sequence.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationHelpPanel.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHelpPanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationHomePanel.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationJndiPanel.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationJndiPanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationTestPanel.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationTestPanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationToolbar.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationToolbar.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/js/tomee/view/ApplicationView.js
- copied unchanged from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationView.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging_index.html
- copied, changed from r1343333,
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html
openejb/trunk/openejb/tomee/tomee-webapp/src/test/java/org/
openejb/trunk/openejb/tomee/tomee-webapp/src/test/java/org/apache/
openejb/trunk/openejb/tomee/tomee-webapp/src/test/java/org/apache/tomee/
openejb/trunk/openejb/tomee/tomee-webapp/src/test/java/org/apache/tomee/webapp/
Removed:
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/UserSessionListener.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceContext.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceContextImpl.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceException.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiHelper.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiHelperImpl.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiTreeHelperImpl.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/OpenEJBHelper.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/OpenEJBHelperImpl.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TestHelper.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TestHelperImpl.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TypeAndValueEntry.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/ConsoleServlet.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/JndiServlet.java
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/TestServlet.java
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/DummyEjb.java
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/EmptyEjb.java
openejb/trunk/openejb/tomee/tomee-loader/src/test/java/org/apache/tomee/loader/test/UserSessionTest.java
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/css/bootstrap-responsive.css
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/index.html
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/Application.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationChannel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationController.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationI18N.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/ApplicationModel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/JndiModel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/model/TestModel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/util/DelayedTask.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/util/Sequence.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHelpPanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationHomePanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationJndiPanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationTestPanel.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationToolbar.js
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/staging/js/tomee/view/ApplicationView.js
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/pom.xml
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/css/bootstrap.css
Modified: openejb/trunk/openejb/tomee/tomee-loader/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/pom.xml?rev=1344252&r1=1344251&r2=1344252&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/pom.xml Wed May 30 13:33:52 2012
@@ -46,11 +46,6 @@
<artifactId>tomee-common</artifactId>
<version>${tomee.version}</version>
</dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.1</version>
- </dependency>
</dependencies>
</project>
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=1344252&r1=1344251&r2=1344252&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
Wed May 30 13:33:52 2012
@@ -25,7 +25,7 @@
<display-name>OpenEJB Loader Application</display-name>
<listener>
-
<listener-class>org.apache.tomee.loader.listener.UserSessionListener</listener-class>
+
<listener-class>org.apache.tomee.webapp.listener.UserSessionListener</listener-class>
</listener>
<servlet>
@@ -46,17 +46,17 @@
<servlet>
<servlet-name>WsConsole</servlet-name>
-
<servlet-class>org.apache.tomee.loader.servlet.ConsoleServlet</servlet-class>
+
<servlet-class>org.apache.tomee.webapp.servlet.ConsoleServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>WsJndi</servlet-name>
-
<servlet-class>org.apache.tomee.loader.servlet.JndiServlet</servlet-class>
+
<servlet-class>org.apache.tomee.webapp.servlet.JndiServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>WsTest</servlet-name>
-
<servlet-class>org.apache.tomee.loader.servlet.TestServlet</servlet-class>
+
<servlet-class>org.apache.tomee.webapp.servlet.TestServlet</servlet-class>
</servlet>
<servlet-mapping>
Modified: openejb/trunk/openejb/tomee/tomee-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/pom.xml?rev=1344252&r1=1344251&r2=1344252&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/pom.xml Wed May 30 13:33:52 2012
@@ -54,6 +54,17 @@
</build>
<dependencies>
<dependency>
+ <groupId>org.apache.tomcat</groupId>
+ <artifactId>tomcat-catalina</artifactId>
+ <version>${tomcat.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.gson</groupId>
+ <artifactId>gson</artifactId>
+ <version>2.1</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.javamail</groupId>
<artifactId>geronimo-javamail_1.4_mail</artifactId>
<scope>runtime</scope>
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiHelper.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiHelper.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiHelper.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiHelper.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiHelper.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiHelper.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiHelper.java
Wed May 30 13:33:52 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.service.helper;
+package org.apache.tomee.webapp.helper.service;
import javax.naming.Context;
import java.lang.reflect.Method;
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiHelperImpl.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiHelperImpl.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiHelperImpl.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiHelperImpl.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiHelperImpl.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiHelperImpl.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiHelperImpl.java
Wed May 30 13:33:52 2012
@@ -15,13 +15,11 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.service.helper;
+package org.apache.tomee.webapp.helper.service;
import org.apache.openejb.AppContext;
import org.apache.openejb.BeanContext;
import org.apache.openejb.ModuleContext;
-import org.apache.tomee.loader.service.ServiceContext;
-import org.apache.tomee.loader.service.ServiceException;
import javax.naming.Context;
import javax.naming.InitialContext;
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiTreeHelperImpl.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiTreeHelperImpl.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiTreeHelperImpl.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiTreeHelperImpl.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiTreeHelperImpl.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/JndiTreeHelperImpl.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/JndiTreeHelperImpl.java
Wed May 30 13:33:52 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.service.helper;
+package org.apache.tomee.webapp.helper.service;
import javax.naming.Binding;
import javax.naming.Context;
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/OpenEJBHelper.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/OpenEJBHelper.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/OpenEJBHelper.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/OpenEJBHelper.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/OpenEJBHelper.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/OpenEJBHelper.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/OpenEJBHelper.java
Wed May 30 13:33:52 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.service.helper;
+package org.apache.tomee.webapp.helper.service;
import org.apache.openejb.AppContext;
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/OpenEJBHelperImpl.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/OpenEJBHelperImpl.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/OpenEJBHelperImpl.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/OpenEJBHelperImpl.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/OpenEJBHelperImpl.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/OpenEJBHelperImpl.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/OpenEJBHelperImpl.java
Wed May 30 13:33:52 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.service.helper;
+package org.apache.tomee.webapp.helper.service;
import org.apache.openejb.AppContext;
import org.apache.openejb.BeanContext;
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceContext.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceContext.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceContext.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceContext.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceContext.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceContext.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceContext.java
Wed May 30 13:33:52 2012
@@ -15,11 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.service;
-
-import org.apache.tomee.loader.service.helper.JndiHelper;
-import org.apache.tomee.loader.service.helper.OpenEJBHelper;
-import org.apache.tomee.loader.service.helper.TestHelper;
+package org.apache.tomee.webapp.helper.service;
public interface ServiceContext {
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceContextImpl.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceContextImpl.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceContextImpl.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceContextImpl.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceContextImpl.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceContextImpl.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceContextImpl.java
Wed May 30 13:33:52 2012
@@ -15,17 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.service;
-
-import org.apache.tomee.loader.service.helper.JndiHelper;
-import org.apache.tomee.loader.service.helper.JndiHelperImpl;
-import org.apache.tomee.loader.service.helper.OpenEJBHelper;
-import org.apache.tomee.loader.service.helper.OpenEJBHelperImpl;
-import org.apache.tomee.loader.service.helper.TestHelper;
-import org.apache.tomee.loader.service.helper.TestHelperImpl;
-
-import java.util.List;
-import java.util.Map;
+package org.apache.tomee.webapp.helper.service;
public class ServiceContextImpl implements ServiceContext {
private final OpenEJBHelper openEJBHelper;
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceException.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceException.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceException.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceException.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceException.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/ServiceException.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/ServiceException.java
Wed May 30 13:33:52 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.service;
+package org.apache.tomee.webapp.helper.service;
public class ServiceException extends RuntimeException {
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TestHelper.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TestHelper.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TestHelper.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TestHelper.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TestHelper.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TestHelper.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TestHelper.java
Wed May 30 13:33:52 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.service.helper;
+package org.apache.tomee.webapp.helper.service;
import java.util.List;
import java.util.Map;
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TestHelperImpl.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TestHelperImpl.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TestHelperImpl.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TestHelperImpl.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TestHelperImpl.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TestHelperImpl.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TestHelperImpl.java
Wed May 30 13:33:52 2012
@@ -15,9 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.service.helper;
-
-import org.apache.tomee.loader.service.ServiceContext;
+package org.apache.tomee.webapp.helper.service;
import java.io.File;
import java.lang.reflect.Method;
@@ -47,14 +45,7 @@ public class TestHelperImpl implements T
result.add(createDTO("homeDirectory", openejbHome.isDirectory()));
- final File openejbHomeLib;
- if (org.apache.tomee.common.TomcatVersion.v6.isTheVersion()
- ||
org.apache.tomee.common.TomcatVersion.v7.isTheVersion()) {
- openejbHomeLib = new File(openejbHome, "lib");
- } else {
- final File common = new File(openejbHome, "common");
- openejbHomeLib = new File(common, "lib");
- }
+ final File openejbHomeLib = new File(openejbHome, "lib");
result.add(createDTO("libDirectory", openejbHomeLib.exists()));
}
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TypeAndValueEntry.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TypeAndValueEntry.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TypeAndValueEntry.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TypeAndValueEntry.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TypeAndValueEntry.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/service/helper/TypeAndValueEntry.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/helper/service/TypeAndValueEntry.java
Wed May 30 13:33:52 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.service.helper;
+package org.apache.tomee.webapp.helper.service;
public class TypeAndValueEntry {
public final Class<?> type;
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/listener/UserSessionListener.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/UserSessionListener.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/listener/UserSessionListener.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/listener/UserSessionListener.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/UserSessionListener.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/listener/UserSessionListener.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/listener/UserSessionListener.java
Wed May 30 13:33:52 2012
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.listener;
+package org.apache.tomee.webapp.listener;
-import org.apache.tomee.loader.service.ServiceContext;
-import org.apache.tomee.loader.service.ServiceContextImpl;
+import org.apache.tomee.webapp.helper.service.ServiceContext;
+import org.apache.tomee.webapp.helper.service.ServiceContextImpl;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpSessionEvent;
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/ConsoleServlet.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/ConsoleServlet.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/ConsoleServlet.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/ConsoleServlet.java
Wed May 30 13:33:52 2012
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.servlet;
+package org.apache.tomee.webapp.servlet;
import javax.script.ScriptEngine;
import javax.script.ScriptEngineManager;
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/JndiServlet.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/JndiServlet.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/JndiServlet.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/JndiServlet.java
Wed May 30 13:33:52 2012
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.servlet;
+package org.apache.tomee.webapp.servlet;
import com.google.gson.Gson;
-import org.apache.tomee.loader.listener.UserSessionListener;
+import org.apache.tomee.webapp.listener.UserSessionListener;
import javax.naming.NamingException;
import javax.servlet.ServletException;
Copied:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/TestServlet.java
(from r1343333,
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/TestServlet.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/TestServlet.java?p2=openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/TestServlet.java&p1=openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/TestServlet.java&r1=1343333&r2=1344252&rev=1344252&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/servlet/TestServlet.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/java/org/apache/tomee/webapp/servlet/TestServlet.java
Wed May 30 13:33:52 2012
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-package org.apache.tomee.loader.servlet;
+package org.apache.tomee.webapp.servlet;
import com.google.gson.Gson;
-import org.apache.tomee.loader.listener.UserSessionListener;
+import org.apache.tomee.webapp.listener.UserSessionListener;
import javax.naming.NamingException;
import javax.servlet.ServletException;
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=1344252&r1=1344251&r2=1344252&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
Wed May 30 13:33:52 2012
@@ -25,7 +25,7 @@
<display-name>OpenEJB Loader Application</display-name>
<listener>
-
<listener-class>org.apache.tomee.loader.listener.UserSessionListener</listener-class>
+
<listener-class>org.apache.tomee.webapp.listener.UserSessionListener</listener-class>
</listener>
<servlet>
@@ -46,17 +46,17 @@
<servlet>
<servlet-name>WsConsole</servlet-name>
-
<servlet-class>org.apache.tomee.loader.servlet.ConsoleServlet</servlet-class>
+
<servlet-class>org.apache.tomee.webapp.servlet.ConsoleServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>WsJndi</servlet-name>
- <servlet-class>org.apache.tomee.loader.servlet.JndiServlet</servlet-class>
+ <servlet-class>org.apache.tomee.webapp.servlet.JndiServlet</servlet-class>
</servlet>
<servlet>
<servlet-name>WsTest</servlet-name>
- <servlet-class>org.apache.tomee.loader.servlet.TestServlet</servlet-class>
+ <servlet-class>org.apache.tomee.webapp.servlet.TestServlet</servlet-class>
</servlet>
<servlet-mapping>
