Copied: openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/PersistenceUnitFactory.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/PersistenceUnitFactory.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/PersistenceUnitFactory.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/PersistenceUnitFactory.java Sun Oct 9 02:43:18 2011 @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.common; +package org.apache.tomee.common; import org.apache.naming.ResourceRef; -import static org.apache.openejb.tomcat.common.NamingUtil.JNDI_NAME; -import static org.apache.openejb.tomcat.common.NamingUtil.getProperty; -import static org.apache.openejb.tomcat.common.NamingUtil.getStaticValue; +import static org.apache.tomee.common.NamingUtil.JNDI_NAME; +import static org.apache.tomee.common.NamingUtil.getProperty; +import static org.apache.tomee.common.NamingUtil.getStaticValue; import javax.naming.Context; import javax.naming.Name;
Copied: openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/ResourceFactory.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/ResourceFactory.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/ResourceFactory.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/ResourceFactory.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/ResourceFactory.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/ResourceFactory.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/ResourceFactory.java Sun Oct 9 02:43:18 2011 @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.common; +package org.apache.tomee.common; -import static org.apache.openejb.tomcat.common.NamingUtil.NAME; -import static org.apache.openejb.tomcat.common.NamingUtil.RESOURCE_ID; -import static org.apache.openejb.tomcat.common.NamingUtil.getProperty; +import static org.apache.tomee.common.NamingUtil.NAME; +import static org.apache.tomee.common.NamingUtil.RESOURCE_ID; +import static org.apache.tomee.common.NamingUtil.getProperty; import javax.naming.Context; import javax.naming.Name; Copied: openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/SystemComponentFactory.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/SystemComponentFactory.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/SystemComponentFactory.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/SystemComponentFactory.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/SystemComponentFactory.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/SystemComponentFactory.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/SystemComponentFactory.java Sun Oct 9 02:43:18 2011 @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.common; +package org.apache.tomee.common; import org.apache.openejb.loader.SystemInstance; -import static org.apache.openejb.tomcat.common.NamingUtil.COMPONENT_TYPE; -import static org.apache.openejb.tomcat.common.NamingUtil.getProperty; -import static org.apache.openejb.tomcat.common.NamingUtil.loadClass; +import static org.apache.tomee.common.NamingUtil.COMPONENT_TYPE; +import static org.apache.tomee.common.NamingUtil.getProperty; +import static org.apache.tomee.common.NamingUtil.loadClass; import javax.naming.Context; import javax.naming.Name; Copied: openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/TomcatVersion.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/TomcatVersion.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/TomcatVersion.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/TomcatVersion.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/TomcatVersion.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/TomcatVersion.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/TomcatVersion.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.common; +package org.apache.tomee.common; import java.util.Properties; Copied: openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/UserTransactionFactory.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/UserTransactionFactory.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/UserTransactionFactory.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/UserTransactionFactory.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/UserTransactionFactory.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/UserTransactionFactory.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/UserTransactionFactory.java Sun Oct 9 02:43:18 2011 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.common; +package org.apache.tomee.common; import org.apache.openejb.core.CoreUserTransaction; import org.apache.openejb.loader.SystemInstance; Copied: openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/WsFactory.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/WsFactory.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/common/WsFactory.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/common/WsFactory.java Sun Oct 9 02:43:18 2011 @@ -15,22 +15,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.common; +package org.apache.tomee.common; import org.apache.naming.ResourceRef; import org.apache.openejb.Injection; import org.apache.openejb.core.ivm.naming.JaxWsServiceReference; import org.apache.openejb.core.webservices.HandlerChainData; import org.apache.openejb.core.webservices.PortRefData; -import static org.apache.openejb.tomcat.common.NamingUtil.JNDI_NAME; -import static org.apache.openejb.tomcat.common.NamingUtil.WSDL_URL; -import static org.apache.openejb.tomcat.common.NamingUtil.WS_CLASS; -import static org.apache.openejb.tomcat.common.NamingUtil.WS_ID; -import static org.apache.openejb.tomcat.common.NamingUtil.WS_PORT_QNAME; -import static org.apache.openejb.tomcat.common.NamingUtil.WS_QNAME; -import static org.apache.openejb.tomcat.common.NamingUtil.getProperty; -import static org.apache.openejb.tomcat.common.NamingUtil.getStaticValue; -import static org.apache.openejb.tomcat.common.NamingUtil.loadClass; +import static org.apache.tomee.common.NamingUtil.JNDI_NAME; +import static org.apache.tomee.common.NamingUtil.WSDL_URL; +import static org.apache.tomee.common.NamingUtil.WS_CLASS; +import static org.apache.tomee.common.NamingUtil.WS_ID; +import static org.apache.tomee.common.NamingUtil.WS_PORT_QNAME; +import static org.apache.tomee.common.NamingUtil.WS_QNAME; +import static org.apache.tomee.common.NamingUtil.getProperty; +import static org.apache.tomee.common.NamingUtil.getStaticValue; +import static org.apache.tomee.common.NamingUtil.loadClass; import javax.naming.Context; import javax.naming.Name; Copied: openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/installer/Installer.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java Sun Oct 9 02:43:18 2011 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.installer; +package org.apache.tomee.installer; import org.apache.openejb.loader.SystemInstance; import org.apache.openejb.webapp.common.Alerts; Copied: openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/InstallerServlet.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/installer/InstallerServlet.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/InstallerServlet.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/InstallerServlet.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/installer/InstallerServlet.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/installer/InstallerServlet.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/InstallerServlet.java Sun Oct 9 02:43:18 2011 @@ -15,9 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.installer; +package org.apache.tomee.installer; -import static org.apache.openejb.tomcat.installer.Installer.Status.NONE; +import static org.apache.tomee.installer.Installer.Status.NONE; import javax.servlet.ServletConfig; import javax.servlet.ServletException; Copied: openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java (from r1180521, openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java&r1=1180521&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/openejb/tomcat/installer/Paths.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Paths.java Sun Oct 9 02:43:18 2011 @@ -15,13 +15,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.installer; +package org.apache.tomee.installer; import java.io.File; import java.util.ArrayList; import java.util.List; -import org.apache.openejb.tomcat.common.TomcatVersion; +import org.apache.tomee.common.TomcatVersion; /** * This class is used to verify that all the main directories and files exist. * @see #verify() for more details Modified: openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1180528&r1=1180527&r2=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java Sun Oct 9 02:43:18 2011 @@ -33,7 +33,7 @@ import org.apache.openejb.assembler.clas import org.apache.openejb.assembler.classic.Assembler; import org.apache.openejb.config.ConfigurationFactory; import org.apache.openejb.loader.SystemInstance; -import org.apache.openejb.tomcat.catalina.TomcatLoader; +import org.apache.tomee.catalina.TomcatLoader; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; import org.apache.velocity.app.Velocity; Modified: openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml?rev=1180528&r1=1180527&r2=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-embedded/src/main/resources/META-INF/org.apache.openejb.tomcat/service-jar.xml Sun Oct 9 02:43:18 2011 @@ -476,7 +476,7 @@ id="Tomcat Security Service" service="SecurityService" types="SecurityService" - class-name="org.apache.openejb.tomcat.catalina.TomcatSecurityService"/> + class-name="org.apache.tomee.catalina.TomcatSecurityService"/> <ServiceProvider id="PseudoSecurityService" Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/EmbeddedJarScanner.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/EmbeddedJarScanner.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/EmbeddedJarScanner.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/EmbeddedJarScanner.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/EmbeddedJarScanner.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/EmbeddedJarScanner.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/EmbeddedJarScanner.java Sun Oct 9 02:43:18 2011 @@ -14,13 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader; +package org.apache.tomee.loader; import org.apache.juli.logging.Log; import org.apache.juli.logging.LogFactory; import org.apache.tomcat.JarScanner; import org.apache.tomcat.JarScannerCallback; -import org.apache.tomcat.util.file.Matcher; import org.apache.tomcat.util.res.StringManager; import org.apache.tomcat.util.scan.Constants; @@ -30,12 +29,8 @@ import java.io.IOException; import java.net.JarURLConnection; import java.net.URISyntaxException; import java.net.URL; -import java.net.URLClassLoader; import java.net.URLConnection; -import java.util.HashSet; -import java.util.Iterator; import java.util.Set; -import java.util.StringTokenizer; /** * @version $Rev$ $Date$ Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/LoaderServlet.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/LoaderServlet.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/LoaderServlet.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/LoaderServlet.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader; +package org.apache.tomee.loader; import java.util.Properties; import java.util.Enumeration; Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/OpenEJBListener.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/OpenEJBListener.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/OpenEJBListener.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/OpenEJBListener.java Sun Oct 9 02:43:18 2011 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader; +package org.apache.tomee.loader; import java.io.File; import java.util.Properties; Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/TomEEJarScanner.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomEEJarScanner.java Sun Oct 9 02:43:18 2011 @@ -17,14 +17,12 @@ * under the License. */ -package org.apache.openejb.tomcat.loader; +package org.apache.tomee.loader; import org.apache.tomcat.JarScannerCallback; import org.apache.tomcat.util.scan.StandardJarScanner; import javax.servlet.ServletContext; -import java.io.File; -import java.util.HashSet; import java.util.Set; public class TomEEJarScanner extends StandardJarScanner { Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatEmbedder.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatEmbedder.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatEmbedder.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatEmbedder.java Sun Oct 9 02:43:18 2011 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader; +package org.apache.tomee.loader; import java.io.File; import java.lang.reflect.Method; @@ -94,7 +94,7 @@ public class TomcatEmbedder { // TomcatHook.hook() //This is loaded by childCl and is defined in the openejb-tomcat-loader - Class<?> tomcatUtilClass = childCl.loadClass("org.apache.openejb.tomcat.loader.TomcatHook"); + Class<?> tomcatUtilClass = childCl.loadClass("org.apache.tomee.loader.TomcatHook"); Method hookMethod = tomcatUtilClass.getDeclaredMethod("hook", Properties.class); hookMethod.setAccessible(true); hookMethod.invoke(null, properties); Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHelper.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHelper.java Sun Oct 9 02:43:18 2011 @@ -15,11 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader; +package org.apache.tomee.loader; import java.io.File; import java.lang.management.ManagementFactory; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.security.Principal; @@ -30,7 +29,6 @@ import org.apache.catalina.Realm; import org.apache.catalina.Wrapper; import org.apache.catalina.core.StandardContext; import org.apache.catalina.core.StandardServer; -import org.apache.openejb.loader.SystemInstance; public class TomcatHelper { @@ -150,7 +148,7 @@ public class TomcatHelper { public static void configureJarScanner(StandardContext standardContext) { try { - Class<?> cls = Class.forName("org.apache.openejb.tomcat.loader.TomEEJarScanner"); + Class<?> cls = Class.forName("org.apache.tomee.loader.TomEEJarScanner"); Class<?> jarScannerCls = Class.forName("org.apache.tomcat.JarScanner"); Object instance = cls.newInstance(); StandardContext.class.getMethod("setJarScanner", jarScannerCls).invoke(standardContext, instance); Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHook.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHook.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/TomcatHook.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/TomcatHook.java Sun Oct 9 02:43:18 2011 @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader; +package org.apache.tomee.loader; import org.apache.openejb.loader.Embedder; import org.apache.openejb.loader.SystemInstance; Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/UrlSet.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/UrlSet.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/UrlSet.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/UrlSet.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/UrlSet.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/UrlSet.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/UrlSet.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader; +package org.apache.tomee.loader; import java.io.File; import java.io.IOException; @@ -29,9 +29,9 @@ import java.util.Iterator; import java.util.List; import java.util.Map; -import org.apache.openejb.tomcat.loader.filter.Filter; -import static org.apache.openejb.tomcat.loader.filter.Filters.invert; -import static org.apache.openejb.tomcat.loader.filter.Filters.patterns; +import org.apache.tomee.loader.filter.Filter; +import static org.apache.tomee.loader.filter.Filters.invert; +import static org.apache.tomee.loader.filter.Filters.patterns; /** * @version $Rev$ $Date$ Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/ClassFilter.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/ClassFilter.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/ClassFilter.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/ClassFilter.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/ClassFilter.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/ClassFilter.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/ClassFilter.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader.filter; +package org.apache.tomee.loader.filter; /** * @version $Rev$ $Date$ Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/ContainsFilter.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/ContainsFilter.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/ContainsFilter.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/ContainsFilter.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/ContainsFilter.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/ContainsFilter.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/ContainsFilter.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader.filter; +package org.apache.tomee.loader.filter; /** * @version $Rev$ $Date$ Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/ExcludeIncludeFilter.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/ExcludeIncludeFilter.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/ExcludeIncludeFilter.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/ExcludeIncludeFilter.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/ExcludeIncludeFilter.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/ExcludeIncludeFilter.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/ExcludeIncludeFilter.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader.filter; +package org.apache.tomee.loader.filter; /** * First, all Exclude directives are evaluated; if any match, the className is denied unless it also matches an Include directive. Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filter.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/Filter.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filter.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filter.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/Filter.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/Filter.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filter.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader.filter; +package org.apache.tomee.loader.filter; /** * @version $Rev$ $Date$ Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/FilterList.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/FilterList.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/FilterList.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/FilterList.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/FilterList.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/FilterList.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/FilterList.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader.filter; +package org.apache.tomee.loader.filter; import java.util.ArrayList; import java.util.Arrays; Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/Filters.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/Filters.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/Filters.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/Filters.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader.filter; +package org.apache.tomee.loader.filter; import java.util.ArrayList; import java.util.Arrays; Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/IncludeExcludeFilter.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/IncludeExcludeFilter.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/IncludeExcludeFilter.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/IncludeExcludeFilter.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/IncludeExcludeFilter.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/IncludeExcludeFilter.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/IncludeExcludeFilter.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader.filter; +package org.apache.tomee.loader.filter; /** * First, all Include directives are evaluated; at least one must match, or the className is rejected. Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/PackageFilter.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/PackageFilter.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/PackageFilter.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/PackageFilter.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/PackageFilter.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/PackageFilter.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/PackageFilter.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader.filter; +package org.apache.tomee.loader.filter; /** * @version $Rev$ $Date$ Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/PatternFilter.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/PatternFilter.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/PatternFilter.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/PatternFilter.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/PatternFilter.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/PatternFilter.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/PatternFilter.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader.filter; +package org.apache.tomee.loader.filter; import java.util.regex.Pattern; Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/PrefixFilter.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/PrefixFilter.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/PrefixFilter.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/PrefixFilter.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/PrefixFilter.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/PrefixFilter.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/PrefixFilter.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader.filter; +package org.apache.tomee.loader.filter; /** * @version $Rev$ $Date$ Copied: openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/SuffixFilter.java (from r1180518, openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/SuffixFilter.java) URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/SuffixFilter.java?p2=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/SuffixFilter.java&p1=openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/SuffixFilter.java&r1=1180518&r2=1180528&rev=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/openejb/tomcat/loader/filter/SuffixFilter.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-loader/src/main/java/org/apache/tomee/loader/filter/SuffixFilter.java Sun Oct 9 02:43:18 2011 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.openejb.tomcat.loader.filter; +package org.apache.tomee.loader.filter; /** * @version $Rev$ $Date$ Modified: openejb/trunk/openejb/assembly/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml?rev=1180528&r1=1180527&r2=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-plus-webapp/src/main/webapp/WEB-INF/web.xml Sun Oct 9 02:43:18 2011 @@ -26,7 +26,7 @@ <servlet> <servlet-name>LoaderServlet</servlet-name> - <servlet-class>org.apache.openejb.tomcat.loader.LoaderServlet</servlet-class> + <servlet-class>org.apache.tomee.loader.LoaderServlet</servlet-class> <load-on-startup>0</load-on-startup> </servlet> @@ -37,7 +37,7 @@ <servlet> <servlet-name>InstallerServlet</servlet-name> - <servlet-class>org.apache.openejb.tomcat.installer.InstallerServlet</servlet-class> + <servlet-class>org.apache.tomee.installer.InstallerServlet</servlet-class> </servlet> <servlet-mapping> Modified: openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml?rev=1180528&r1=1180518&r2=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/resources/META-INF/org.apache.tomee/service-jar.xml Sun Oct 9 02:43:18 2011 @@ -476,7 +476,7 @@ id="Tomcat Security Service" service="SecurityService" types="SecurityService" - class-name="org.apache.openejb.tomcat.catalina.TomcatSecurityService"/> + class-name="org.apache.tomee.catalina.TomcatSecurityService"/> <ServiceProvider id="PseudoSecurityService" Modified: openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml?rev=1180528&r1=1180527&r2=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/WEB-INF/web.xml Sun Oct 9 02:43:18 2011 @@ -26,7 +26,7 @@ <servlet> <servlet-name>LoaderServlet</servlet-name> - <servlet-class>org.apache.openejb.tomcat.loader.LoaderServlet</servlet-class> + <servlet-class>org.apache.tomee.loader.LoaderServlet</servlet-class> <load-on-startup>0</load-on-startup> </servlet> @@ -37,7 +37,7 @@ <servlet> <servlet-name>InstallerServlet</servlet-name> - <servlet-class>org.apache.openejb.tomcat.installer.InstallerServlet</servlet-class> + <servlet-class>org.apache.tomee.installer.InstallerServlet</servlet-class> </servlet> <servlet-mapping> Modified: openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/index.jsp URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/index.jsp?rev=1180528&r1=1180527&r2=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/index.jsp (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/index.jsp Sun Oct 9 02:43:18 2011 @@ -19,7 +19,7 @@ <!-- $Rev: 597221 $ $Date: 2007-11-21 22:51:05 +0100 (Wed, 21 Nov 2007) $ --> -<%@ page import="org.apache.openejb.tomcat.installer.Installer" %> +<%@ page import="org.apache.tomee.installer.Installer" %> <html> <head> <META http-equiv="Content-Type" content="text/html; charset=UTF-8"> Modified: openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/installer-view.jsp URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/installer-view.jsp?rev=1180528&r1=1180527&r2=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/installer-view.jsp (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/installer-view.jsp Sun Oct 9 02:43:18 2011 @@ -19,9 +19,9 @@ <!-- $Rev: 597221 $ $Date: 2007-11-21 22:51:05 +0100 (Wed, 21 Nov 2007) $ --> -<%@ page import="org.apache.openejb.tomcat.installer.Installer" %> +<%@ page import="org.apache.tomee.installer.Installer" %> <%@ page import="java.io.File" %> -<%@ page import="org.apache.openejb.tomcat.installer.Paths" %> +<%@ page import="org.apache.tomee.installer.Paths" %> <%@ page import="java.util.List" %> <%@ page import="java.util.ArrayList" %> <% Modified: openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/testhome.jsp URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/testhome.jsp?rev=1180528&r1=1180527&r2=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/testhome.jsp (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-webapp/src/main/webapp/testhome.jsp Sun Oct 9 02:43:18 2011 @@ -24,7 +24,7 @@ javax.servlet.http.HttpServletRequest, javax.servlet.jsp.JspWriter, java.io.File "%> -<%@ page import="org.apache.openejb.tomcat.common.TomcatVersion"%> +<%@ page import="org.apache.tomee.common.TomcatVersion"%> <html> <head> <META http-equiv="Content-Type" content="text/html; charset=UTF-8"> @@ -43,7 +43,13 @@ java.io.File <tr> <td bgcolor="#5A5CB8" align="left" valign="top" bgcolor="#ffffff" width="13"><img border="0" height="15" width="13" src="images/dotTrans.gif"></td> <td align="left" valign="top" width="40"><img border="0" height="1" width="1" src="images/dotTrans.gif"></td> - <td align="left" valign="middle" width="530"><a href="http://openejb.apache.org";><span class="menuTopOff">OpenEJB</span></a><img border="0" height="2" width="20" src="images/dotTrans.gif"><a href="index.jsp"><span class="menuTopOff">Index</span></a><img border="0" height="2" width="20" src="images/dotTrans.gif"><a href="viewjndi.jsp"><span class="menuTopOff">JNDI</span></a><img border="0" height="2" width="20" src="images/dotTrans.gif"><a href="viewejb.jsp"><span class="menuTopOff">EJB</span></a><img border="0" height="2" width="20" src="images/dotTrans.gif"><a href="viewclass.jsp"><span class="menuTopOff">Class</span></a><img border="0" height="2" width="20" src="images/dotTrans.gif"><a href="invokeobj.jsp"><span class="menuTopOff">Invoke</span></a><img border="0" height="2" width="20" src="images/dotTrans.gif"></td> + <td align="left" valign="middle" width="530"><a href="http://openejb.apache.org";><span class="menuTopOff">OpenEJB</span></a><img border="0" height="2" width="20" + src="images/dotTrans.gif"><a + href="index.jsp"><span class="menuTopOff">Index</span></a><img border="0" height="2" width="20" src="images/dotTrans.gif"><a href="viewjndi.jsp"><span + class="menuTopOff">JNDI</span></a><img border="0" height="2" width="20" src="images/dotTrans.gif"><a href="viewejb.jsp"><span class="menuTopOff">EJB</span></a><img + border="0" height="2" width="20" src="images/dotTrans.gif"><a href="viewclass.jsp"><span class="menuTopOff">Class</span></a><img border="0" height="2" width="20" + src="images/dotTrans.gif"><a + href="invokeobj.jsp"><span class="menuTopOff">Invoke</span></a><img border="0" height="2" width="20" src="images/dotTrans.gif"></td> <td align="left" valign="top" height="20" width="120"><img border="0" height="2" width="10" src="images/dotTrans.gif"></td> </tr> <tr> Modified: openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java?rev=1180528&r1=1180527&r2=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatRsRegistry.java Sun Oct 9 02:43:18 2011 @@ -30,7 +30,7 @@ import org.apache.catalina.core.Standard import org.apache.openejb.server.httpd.HttpListener; import org.apache.openejb.server.rest.RsRegistry; import org.apache.openejb.server.rest.RsServlet; -import org.apache.openejb.tomcat.loader.TomcatHelper; +import org.apache.tomee.loader.TomcatHelper; import org.apache.openejb.util.LogCategory; import org.apache.openejb.util.Logger; @@ -41,7 +41,7 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import static org.apache.openejb.tomcat.catalina.TomcatWebAppBuilder.IGNORE_CONTEXT; +import static org.apache.tomee.catalina.TomcatWebAppBuilder.IGNORE_CONTEXT; public class TomcatRsRegistry implements RsRegistry { private static final Logger LOGGER = Logger.getInstance(LogCategory.OPENEJB_STARTUP, TomcatRsRegistry.class); Modified: openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java?rev=1180528&r1=1180527&r2=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomcatWsRegistry.java Sun Oct 9 02:43:18 2011 @@ -39,8 +39,8 @@ import org.apache.catalina.deploy.Securi import org.apache.openejb.server.httpd.HttpListener; import org.apache.openejb.server.webservices.WsRegistry; import org.apache.openejb.server.webservices.WsServlet; -import org.apache.openejb.tomcat.catalina.OpenEJBValve; -import org.apache.openejb.tomcat.loader.TomcatHelper; +import org.apache.tomee.catalina.OpenEJBValve; +import org.apache.tomee.loader.TomcatHelper; import java.net.URI; import java.net.URISyntaxException; @@ -50,8 +50,8 @@ import java.util.List; import java.util.Map; import java.util.TreeMap; -import static org.apache.openejb.tomcat.catalina.BackportUtil.getServlet; -import static org.apache.openejb.tomcat.catalina.TomcatWebAppBuilder.IGNORE_CONTEXT; +import static org.apache.tomee.catalina.BackportUtil.getServlet; +import static org.apache.tomee.catalina.TomcatWebAppBuilder.IGNORE_CONTEXT; public class TomcatWsRegistry implements WsRegistry { private final Map<String, Context> webserviceContexts = new TreeMap<String, Context>(); Modified: openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomeeJaxRsService.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomeeJaxRsService.java?rev=1180528&r1=1180527&r2=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomeeJaxRsService.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomeeJaxRsService.java Sun Oct 9 02:43:18 2011 @@ -21,8 +21,8 @@ import org.apache.openejb.loader.SystemI import org.apache.openejb.server.rest.RESTService; import org.apache.openejb.server.rest.RsRegistry; import org.apache.openejb.spi.Service; -import org.apache.openejb.tomcat.catalina.WebDeploymentListener; -import org.apache.openejb.tomcat.catalina.WebDeploymentListeners; +import org.apache.tomee.catalina.WebDeploymentListener; +import org.apache.tomee.catalina.WebDeploymentListeners; import java.util.Properties; Modified: openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomeeJaxWsService.java URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomeeJaxWsService.java?rev=1180528&r1=1180527&r2=1180528&view=diff ============================================================================== --- openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomeeJaxWsService.java (original) +++ openejb/trunk/openejb/assembly/tomee/tomee-webservices/src/main/java/org/apache/tomee/webservices/TomeeJaxWsService.java Sun Oct 9 02:43:18 2011 @@ -21,8 +21,8 @@ import org.apache.openejb.loader.SystemI import org.apache.openejb.server.webservices.WsRegistry; import org.apache.openejb.server.webservices.WsService; import org.apache.openejb.spi.Service; -import org.apache.openejb.tomcat.catalina.WebDeploymentListener; -import org.apache.openejb.tomcat.catalina.WebDeploymentListeners; +import org.apache.tomee.catalina.WebDeploymentListener; +import org.apache.tomee.catalina.WebDeploymentListeners; import java.util.Properties;
