You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomee.apache.org by Romain Manni-Bucau <rm...@gmail.com> on 2011/12/23 23:00:51 UTC
Fwd: svn commit: r1222865 - in /openejb/trunk/openejb: ./ assembly/
assembly/openejb-webapp-common/ assembly/tomee/ container/
container/openejb-core-hibernate/ container/openejb-core-legacy-client/
container/openejb-osgi-core/ container/openejb-osgi
Hi,
Please shout if the new layout is not ok for you.
Merry Xmas.
- Romain
---------- Forwarded message ----------
From: <rm...@apache.org>
Date: 2011/12/23
Subject: svn commit: r1222865 - in /openejb/trunk/openejb: ./ assembly/
assembly/openejb-webapp-common/ assembly/tomee/ container/
container/openejb-core-hibernate/ container/openejb-core-legacy-client/
container/openejb-osgi-core/ container/openejb-osgi/ conta...
To: commits@openejb.apache.org
Author: rmannibucau
Date: Fri Dec 23 21:57:29 2011
New Revision: 1222865
URL: http://svn.apache.org/viewvc?rev=1222865&view=rev
Log:
big refactoring on svn structure. trying to be more consistent. Cleaning
container module. Moving tomee to the same level than arquillian. creating
an osgi module (for integration + maybe karaf commands + maybe karafEE...).
Moving spring and hibernate integration modules in utils since it is not
directly related to OpenEJB or TomEE.
Added:
openejb/trunk/openejb/osgi/
openejb/trunk/openejb/osgi/openejb-core-osgi/
- copied from r1222314, openejb/trunk/openejb/container/openejb-osgi/
openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml
- copied, changed from r1222610,
openejb/trunk/openejb/container/openejb-osgi/pom.xml
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/filtered-resources/features.xml
- copied unchanged from r1222416,
openejb/trunk/openejb/container/openejb-osgi/src/main/filtered-resources/features.xml
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
- copied unchanged from r1222416,
openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Activator.java
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/BundleFinderFactory.java
(with props)
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
- copied unchanged from r1222813,
openejb/trunk/openejb/container/openejb-osgi/src/main/java/org/apache/openejb/core/osgi/impl/Deployer.java
openejb/trunk/openejb/osgi/pom.xml
openejb/trunk/openejb/tomee/
- copied from r1222314, openejb/trunk/openejb/assembly/tomee/
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Alerts.java
(contents, props changed)
- copied, changed from r1222314,
openejb/trunk/openejb/assembly/openejb-webapp-common/src/main/java/org/apache/openejb/webapp/common/Alerts.java
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installers.java
(contents, props changed)
- copied, changed from r1222314,
openejb/trunk/openejb/assembly/openejb-webapp-common/src/main/java/org/apache/openejb/webapp/common/Installers.java
openejb/trunk/openejb/utils/openejb-core-hibernate/
- copied from r1222314,
openejb/trunk/openejb/container/openejb-core-hibernate/
openejb/trunk/openejb/utils/openejb-core-legacy-client/
- copied from r1222314,
openejb/trunk/openejb/container/openejb-core-legacy-client/
openejb/trunk/openejb/utils/openejb-spring/
- copied from r1222314, openejb/trunk/openejb/container/openejb-spring/
Removed:
openejb/trunk/openejb/assembly/openejb-webapp-common/
openejb/trunk/openejb/assembly/tomee/
openejb/trunk/openejb/container/openejb-core-hibernate/
openejb/trunk/openejb/container/openejb-core-legacy-client/
openejb/trunk/openejb/container/openejb-osgi/
openejb/trunk/openejb/container/openejb-osgi-core/
openejb/trunk/openejb/container/openejb-spring/
Modified:
openejb/trunk/openejb/assembly/pom.xml
openejb/trunk/openejb/container/pom.xml
openejb/trunk/openejb/pom.xml
openejb/trunk/openejb/tomee/apache-tomee/pom.xml
openejb/trunk/openejb/tomee/pom.xml
openejb/trunk/openejb/tomee/tomee-catalina/pom.xml
openejb/trunk/openejb/tomee/tomee-common/pom.xml
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
openejb/trunk/openejb/tomee/tomee-embedded/pom.xml
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
openejb/trunk/openejb/tomee/tomee-loader/pom.xml
openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml
openejb/trunk/openejb/tomee/tomee-webapp/pom.xml
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/ejbclasses.html
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/ejbref.html
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/enc-help.html
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/howitworks.html
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.jsp
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/installer-view.jsp
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/invokeobj.jsp
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/re-help.html
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testejb.jsp
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testhome.jsp
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testint.jsp
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testsuite.jsp
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewclass.jsp
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewejb.jsp
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewjndi.jsp
openejb/trunk/openejb/tomee/tomee-webservices/pom.xml
openejb/trunk/openejb/utils/openejb-core-hibernate/pom.xml
openejb/trunk/openejb/utils/openejb-core-legacy-client/pom.xml
openejb/trunk/openejb/utils/openejb-spring/pom.xml
openejb/trunk/openejb/utils/openejb-spring/src/main/java/org/apache/openejb/spring/SingletonContainer.java
openejb/trunk/openejb/utils/pom.xml
Modified: openejb/trunk/openejb/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/assembly/pom.xml?rev=1222865&r1=1222864&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/assembly/pom.xml (original)
+++ openejb/trunk/openejb/assembly/pom.xml Fri Dec 23 21:57:29 2011
@@ -30,8 +30,6 @@
<name>OpenEJB :: Assembly</name>
<modules>
- <module>openejb-webapp-common</module>
- <module>tomee</module>
<module>openejb-standalone</module>
<module>openejb-lite</module>
<!-- don't run this just yet, its in progress -->
Modified: openejb/trunk/openejb/container/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/pom.xml?rev=1222865&r1=1222864&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/container/pom.xml (original)
+++ openejb/trunk/openejb/container/pom.xml Fri Dec 23 21:57:29 2011
@@ -32,12 +32,7 @@
<module>openejb-loader</module>
<module>openejb-javaagent</module>
<module>openejb-jee</module>
- <module>openejb-spring</module>
- <module>openejb-osgi-core</module>
- <module>openejb-osgi</module>
<module>openejb-junit</module>
- <module>openejb-core-hibernate</module>
<module>openejb-jsf</module>
- <module>openejb-core-legacy-client</module>
</modules>
</project>
\ No newline at end of file
Copied: openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml (from
r1222610, openejb/trunk/openejb/container/openejb-osgi/pom.xml)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml?p2=openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml&p1=openejb/trunk/openejb/container/openejb-osgi/pom.xml&r1=1222610&r2=1222865&rev=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-osgi/pom.xml (original)
+++ openejb/trunk/openejb/osgi/openejb-core-osgi/pom.xml Fri Dec 23
21:57:29 2011
@@ -20,14 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>container</artifactId>
+ <artifactId>osgi</artifactId>
<groupId>org.apache.openejb</groupId>
<version>4.0.0-beta-2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-core-osgi</artifactId>
<packaging>bundle</packaging>
- <name>OpenEJB :: Container :: OSGi</name>
+ <name>OpenEJB :: OSGi :: Core</name>
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
@@ -186,11 +186,15 @@
org.apache.openejb.server;resolution:=optional;version="[4.0,5.0)",
org.apache.openejb.util;version="[4.0,5.0)";resolution:=optional,
org.apache.openejb.util.proxy;version="[4.0,5.0)";resolution:=optional,
+ org.apache.xbean;version="[3.7,4]",
+ org.apache.xbean.finder;version="[3.7,4]",
+ org.apache.xbean.osgi.bundle.util;version="[3.7,4]",
org.apache.xerces;resolution:=optional,
org.apache.xml.resolver;resolution:=optional,
org.hsqldb.jdbc;resolution:=optional,
org.junit;resolution:=optional,
org.osgi.framework;version="[1.4,1.6)",
+ org.osgi.service.packageadmin;version="[1.4,1.6)",
org.osgi.util.tracker;version="[1.4,1.6)",
org.slf4j;version="[1.6,2)",
javassist.util.proxy;version="[3.9,4)"
@@ -221,20 +225,6 @@
</execution>
</executions>
</plugin>
-
- <!--
- <plugin> <groupId>org.apache.felix.karaf.tooling</groupId>
- <artifactId>features-maven-plugin</artifactId>
- <version>1.0.0</version> <executions> <execution>
- <id>add-features-to-repo</id> <phase>generate-resources</phase>
- <goals> <goal>add-features-to-repo</goal> </goals>
- <configuration> <descriptors>
-
<descriptor>file:${basedir}/target/classes/features.xml</descriptor>
- </descriptors> <features> <feature>javaee-api</feature>
- <feature>openejb-core</feature> </features>
- <repository>target/features-repo</repository> </configuration>
- </execution> </executions> </plugin>
- -->
</plugins>
</build>
Added:
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/BundleFinderFactory.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/BundleFinderFactory.java?rev=1222865&view=auto
==============================================================================
---
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/BundleFinderFactory.java
(added)
+++
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/BundleFinderFactory.java
Fri Dec 23 21:57:29 2011
@@ -0,0 +1,175 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.openejb.core.osgi.impl;
+
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Enumeration;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.zip.ZipEntry;
+
+import org.apache.openejb.config.DeploymentModule;
+import org.apache.openejb.config.FinderFactory;
+import org.apache.xbean.finder.IAnnotationFinder;
+import org.apache.xbean.finder.BundleAnnotationFinder;
+import org.apache.xbean.osgi.bundle.util.BundleResourceFinder;
+import org.apache.xbean.osgi.bundle.util.DiscoveryRange;
+import org.apache.xbean.osgi.bundle.util.ResourceDiscoveryFilter;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleReference;
+import org.osgi.framework.ServiceReference;
+import org.osgi.service.packageadmin.PackageAdmin;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class BundleFinderFactory extends FinderFactory {
+ private static final String META_INF_BEANS_XML = "META-INF/beans.xml";
+ private static final String WEB_INF_BEANS_XML = "WEB-INF/beans.xml";
+
+ @Override
+ public IAnnotationFinder create(DeploymentModule module) throws
Exception {
+
+ ClassLoader moduleCL = module.getClassLoader();
+
+ while (!(moduleCL instanceof BundleReference)) {
+
+ moduleCL = moduleCL.getParent();
+
+ if (moduleCL == null)
+ break;
+
+ }
+
+ if (moduleCL != null && moduleCL instanceof BundleReference) {
+ Bundle bundle = ((BundleReference) moduleCL).getBundle();
+ BundleContext bundleContext = bundle.getBundleContext();
+ ServiceReference sr =
bundleContext.getServiceReference(PackageAdmin.class.getName());
+ PackageAdmin packageAdmin = (PackageAdmin)
bundleContext.getService(sr);
+ final String location = module.getModuleUri().toString();
+ final boolean isWAR = location.endsWith(".war");
+ boolean useLocation = location != null
+ && !location.isEmpty()
+ && !module.isStandaloneModule();
+ Set<String> beanArchiveJarNames = findBeansXml(bundle,
packageAdmin, useLocation? location : "");
+
+ BundleAnnotationFinder bundleAnnotationFinder;
+ if (useLocation) {
+ ResourceDiscoveryFilter filter = new
ResourceDiscoveryFilter() {
+
+ @Override
+ public boolean rangeDiscoveryRequired(DiscoveryRange
discoveryRange) {
+ return discoveryRange ==
DiscoveryRange.BUNDLE_CLASSPATH || discoveryRange ==
DiscoveryRange.FRAGMENT_BUNDLES;
+ }
+
+ @Override
+ public boolean zipFileDiscoveryRequired(String s) {
+ return isWAR ? s.startsWith(location) :
s.equals(location);
+ }
+
+ @Override
+ public boolean directoryDiscoveryRequired(String s) {
+ return isWAR ? s.startsWith(location) :
s.equals(location);
+ }
+ };
+
+ bundleAnnotationFinder = new
BundleAnnotationFinder(packageAdmin, bundle, filter, beanArchiveJarNames);
+ } else {
+ ResourceDiscoveryFilter filter = new
ResourceDiscoveryFilter() {
+
+ @Override
+ public boolean rangeDiscoveryRequired(DiscoveryRange
discoveryRange) {
+ return discoveryRange ==
DiscoveryRange.BUNDLE_CLASSPATH || discoveryRange ==
DiscoveryRange.FRAGMENT_BUNDLES;
+ }
+
+ @Override
+ public boolean zipFileDiscoveryRequired(String s) {
+ return true;
+ }
+
+ @Override
+ public boolean directoryDiscoveryRequired(String s) {
+ return true;
+ }
+ };
+
+ bundleAnnotationFinder = new
BundleAnnotationFinder(packageAdmin, bundle, filter, beanArchiveJarNames);
+ }
+ bundleAnnotationFinder.link();
+ return bundleAnnotationFinder;
+ }
+
+ throw new IllegalStateException("Module classloader is not a
BundleReference. Only use BundleFactoryFinder in an pure osgi environment");
+ }
+
+ //TODO consider passing in location?
+ private Set<String> findBeansXml(Bundle mainBundle, PackageAdmin
packageAdmin, String location)
+ throws Exception
+ {
+ final Set<String> beanArchiveJarNames = new HashSet<String>();
+ BundleResourceFinder brfXmlJar = new
BundleResourceFinder(packageAdmin, mainBundle, "", META_INF_BEANS_XML);
+
+ BundleResourceFinder.ResourceFinderCallback rfCallback = new
BundleResourceFinder.ResourceFinderCallback()
+ {
+
+ public boolean foundInDirectory(Bundle bundle, String
basePath, URL url) throws Exception
+ {
+// logger.info("adding the following beans.xml URL: " +
url);
+ beanArchiveJarNames.add(basePath);
+ return true;
+ }
+
+ public boolean foundInJar(Bundle bundle, String jarName,
ZipEntry entry, InputStream in) throws Exception
+ {
+ URL jarURL = bundle.getEntry(jarName);
+// URL beansUrl = new URL("jar:" + jarURL.toString() + "!/"
+ entry.getName());
+
+// logger.info("adding the following beans.xml URL: " +
beansUrl);
+
+ beanArchiveJarNames.add(jarName);
+ return true;
+ }
+
+ };
+
+ brfXmlJar.find(rfCallback);
+
+// TODO I found no other way to find WEB-INF/beanx.xml directly
+ Enumeration<URL> urls = mainBundle.findEntries(location +
"/WEB-INF", "beans.xml", true);
+ boolean webBeansXmlFound = false;
+ while (urls != null && urls.hasMoreElements()) {
+ URL webBeansXml = urls.nextElement();
+ String webBeansXMlString = webBeansXml.toExternalForm();
+ if (!webBeansXMlString.endsWith("/" + WEB_INF_BEANS_XML)) {
+ continue;
+ }
+
+ if (webBeansXmlFound) {
+ throw new IllegalStateException("found more than
WEB-INF/beans.xml file!" + webBeansXml);
+ }
+
+ // logger.info("adding the following
WEB-INF/beans.xml URL: " + webBeansXml);
+ beanArchiveJarNames.add(location + (location.isEmpty()? "":
"/") + "WEB-INF/classes/");
+ webBeansXmlFound = true;
+
+ }
+ return beanArchiveJarNames;
+ }
+
+}
Propchange:
openejb/trunk/openejb/osgi/openejb-core-osgi/src/main/java/org/apache/openejb/core/osgi/impl/BundleFinderFactory.java
------------------------------------------------------------------------------
svn:eol-style = native
Added: openejb/trunk/openejb/osgi/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/osgi/pom.xml?rev=1222865&view=auto
==============================================================================
--- openejb/trunk/openejb/osgi/pom.xml (added)
+++ openejb/trunk/openejb/osgi/pom.xml Fri Dec 23 21:57:29 2011
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <artifactId>openejb</artifactId>
+ <groupId>org.apache.openejb</groupId>
+ <version>4.0.0-beta-2-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>osgi</artifactId>
+ <packaging>pom</packaging>
+ <name>OpenEJB :: OSGi</name>
+
+ <modules>
+ <module>openejb-core-osgi</module>
+ </modules>
+</project>
Modified: openejb/trunk/openejb/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/pom.xml?rev=1222865&r1=1222864&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/pom.xml (original)
+++ openejb/trunk/openejb/pom.xml Fri Dec 23 21:57:29 2011
@@ -301,9 +301,11 @@
<module>examples</module>
<module>assembly</module>
<module>arquillian-tomee</module>
+ <module>utils</module>
+ <module>tomee</module>
+ <module>osgi</module>
<!-- don't activate it back since it creates artifacts in /tmp when TCK
fails and/or succeeds -->
<!--module>tck</module-->
- <module>utils</module>
</modules>
<profiles>
@@ -318,6 +320,8 @@
<module>arquillian-tomee</module>
<module>assembly</module>
<module>utils</module>
+ <module>tomee</module>
+ <module>osgi</module>
</modules>
<build>
<plugins>
Modified: openejb/trunk/openejb/tomee/apache-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/apache-tomee/pom.xml?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/apache-tomee/pom.xml (original)
+++ openejb/trunk/openejb/tomee/apache-tomee/pom.xml Fri Dec 23 21:57:29
2011
@@ -27,7 +27,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>apache-tomee</artifactId>
<packaging>pom</packaging>
- <name>OpenEJB :: Assembly :: TomEE :: Tomcat 7</name>
+ <name>OpenEJB :: TomEE :: Tomcat 7</name>
<version>1.0.0-beta-2-SNAPSHOT</version>
<dependencies>
@@ -59,13 +59,6 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>openejb-webapp-common</artifactId>
- <version>${openejb.version}</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>${project.groupId}</groupId>
<artifactId>openejb-core</artifactId>
<version>${openejb.version}</version>
<type>jar</type>
Modified: openejb/trunk/openejb/tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/pom.xml?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/pom.xml (original)
+++ openejb/trunk/openejb/tomee/pom.xml Fri Dec 23 21:57:29 2011
@@ -20,14 +20,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>assembly</artifactId>
+ <artifactId>openejb</artifactId>
<groupId>org.apache.openejb</groupId>
<version>4.0.0-beta-2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee</artifactId>
<packaging>pom</packaging>
- <name>OpenEJB :: Assembly :: Tomcat</name>
+ <name>OpenEJB :: TomEE</name>
<modules>
<module>tomee-loader</module>
Modified: openejb/trunk/openejb/tomee/tomee-catalina/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-catalina/pom.xml?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-catalina/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-catalina/pom.xml Fri Dec 23 21:57:29
2011
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-catalina</artifactId>
<packaging>jar</packaging>
- <name>OpenEJB :: Assembly :: Tomcat :: Catalina</name>
+ <name>OpenEJB :: TomEE :: Catalina</name>
<description>This module contains the classes that will be added to the
catalina class loader</description>
<build>
<plugins>
Modified: openejb/trunk/openejb/tomee/tomee-common/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/pom.xml?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-common/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-common/pom.xml Fri Dec 23 21:57:29
2011
@@ -28,16 +28,11 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-common</artifactId>
<packaging>jar</packaging>
- <name>OpenEJB :: Assembly :: Tomcat :: Common</name>
+ <name>OpenEJB :: TomEE :: Common</name>
<description>This module contains the classes that will be added to the
common class loader</description>
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
- <artifactId>openejb-webapp-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
<version>${project.version}</version>
</dependency>
Copied:
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Alerts.java
(from r1222314,
openejb/trunk/openejb/assembly/openejb-webapp-common/src/main/java/org/apache/openejb/webapp/common/Alerts.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Alerts.java?p2=openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Alerts.java&p1=openejb/trunk/openejb/assembly/openejb-webapp-common/src/main/java/org/apache/openejb/webapp/common/Alerts.java&r1=1222314&r2=1222865&rev=1222865&view=diff
==============================================================================
---
openejb/trunk/openejb/assembly/openejb-webapp-common/src/main/java/org/apache/openejb/webapp/common/Alerts.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Alerts.java
Fri Dec 23 21:57:29 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.webapp.common;
+package org.apache.tomee.installer;
import java.util.ArrayList;
import java.util.List;
Propchange:
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Alerts.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installer.java
Fri Dec 23 21:57:29 2011
@@ -18,8 +18,6 @@
package org.apache.tomee.installer;
import org.apache.openejb.loader.SystemInstance;
-import org.apache.openejb.webapp.common.Alerts;
-import org.apache.openejb.webapp.common.Installers;
import java.io.ByteArrayOutputStream;
import java.io.Closeable;
Copied:
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installers.java
(from r1222314,
openejb/trunk/openejb/assembly/openejb-webapp-common/src/main/java/org/apache/openejb/webapp/common/Installers.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installers.java?p2=openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installers.java&p1=openejb/trunk/openejb/assembly/openejb-webapp-common/src/main/java/org/apache/openejb/webapp/common/Installers.java&r1=1222314&r2=1222865&rev=1222865&view=diff
==============================================================================
---
openejb/trunk/openejb/assembly/openejb-webapp-common/src/main/java/org/apache/openejb/webapp/common/Installers.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installers.java
Fri Dec 23 21:57:29 2011
@@ -14,15 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.webapp.common;
+package org.apache.tomee.installer;
import org.codehaus.swizzle.stream.DelimitedTokenReplacementInputStream;
import org.codehaus.swizzle.stream.StringTokenHandler;
-import org.apache.openejb.webapp.common.Alerts;
import java.util.jar.JarFile;
import java.util.zip.ZipEntry;
-import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.IOException;
import java.io.ByteArrayInputStream;
Propchange:
openejb/trunk/openejb/tomee/tomee-common/src/main/java/org/apache/tomee/installer/Installers.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: openejb/trunk/openejb/tomee/tomee-embedded/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/pom.xml?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-embedded/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-embedded/pom.xml Fri Dec 23 21:57:29
2011
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-embedded</artifactId>
<packaging>jar</packaging>
- <name>OpenEJB :: Assembly :: TomEE Embedded</name>
+ <name>OpenEJB :: TomEE :: TomEE Embedded</name>
<version>1.0.0-beta-2-SNAPSHOT</version>
<build>
<plugins>
Modified:
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
(original)
+++
openejb/trunk/openejb/tomee/tomee-embedded/src/main/java/org/apache/tomee/embedded/Container.java
Fri Dec 23 21:57:29 2011
@@ -43,7 +43,6 @@ import org.apache.tomee.catalina.TomcatL
import org.apache.velocity.Template;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
-import org.apache.velocity.runtime.log.Log4JLogChute;
import org.apache.velocity.runtime.log.NullLogChute;
import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;
@@ -272,9 +271,9 @@ public class Container {
}
if (file.isDirectory()) {
- if (".".equals(file.getName()))
+ if ("".equals(file.getName()))
return;
- if ("..".equals(file.getName()))
+ if ("src/main".equals(file.getName()))
return;
File[] children = file.listFiles();
Modified: openejb/trunk/openejb/tomee/tomee-loader/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-loader/pom.xml?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-loader/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-loader/pom.xml Fri Dec 23 21:57:29
2011
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-loader</artifactId>
<packaging>jar</packaging>
- <name>OpenEJB :: Assembly :: Tomcat :: Loader</name>
+ <name>OpenEJB :: TomEE :: Loader</name>
<dependencies>
<dependency>
<groupId>org.apache.openejb</groupId>
Modified: openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-plus-webapp/pom.xml Fri Dec 23
21:57:29 2011
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-plus-webapp</artifactId>
- <name>OpenEJB :: Assembly :: Tomcat :: Plus Webapp</name>
+ <name>OpenEJB :: TomEE :: Plus Webapp</name>
<packaging>war</packaging>
<dependencies>
Modified: openejb/trunk/openejb/tomee/tomee-webapp/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/pom.xml?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/pom.xml Fri Dec 23 21:57:29
2011
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-webapp</artifactId>
<packaging>jar</packaging>
- <name>OpenEJB :: Assembly :: Tomcat :: Webapp</name>
+ <name>OpenEJB :: TomEE :: Webapp</name>
<build>
<plugins>
<plugin>
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/ejbclasses.html
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/ejbclasses.html?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/ejbclasses.html
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/ejbclasses.html
Fri Dec 23 21:57:29 2011
@@ -53,7 +53,7 @@
<table width="430" cellspacing="0" cellpadding="0"
border="0" rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/ejbref.html
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/ejbref.html?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/ejbref.html
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/ejbref.html
Fri Dec 23 21:57:29 2011
@@ -53,7 +53,7 @@
<table width="430" cellspacing="0" cellpadding="0"
border="0" rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/enc-help.html
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/enc-help.html?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/enc-help.html
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/enc-help.html
Fri Dec 23 21:57:29 2011
@@ -53,7 +53,7 @@
<table width="430" cellspacing="0" cellpadding="0"
border="0" rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/howitworks.html
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/howitworks.html?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/howitworks.html
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/howitworks.html
Fri Dec 23 21:57:29 2011
@@ -53,7 +53,7 @@
<table width="500" cellspacing="0" cellpadding="0"
border="0" rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified: openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.jsp
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.jsp?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.jsp
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/index.jsp Fri
Dec 23 21:57:29 2011
@@ -67,7 +67,7 @@
<table width="430" cellspacing="0" cellpadding="0"
border="0" rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/installer-view.jsp
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/installer-view.jsp?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
---
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/installer-view.jsp
(original)
+++
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/installer-view.jsp
Fri Dec 23 21:57:29 2011
@@ -75,7 +75,7 @@
<table width="430" cellspacing="0" cellpadding="0"
border="0" rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/invokeobj.jsp
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/invokeobj.jsp?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/invokeobj.jsp
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/invokeobj.jsp
Fri Dec 23 21:57:29 2011
@@ -66,7 +66,7 @@ java.util.Set
<table width="530" cellspacing="0" cellpadding="0" border="0"
rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/re-help.html
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/re-help.html?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/re-help.html
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/re-help.html
Fri Dec 23 21:57:29 2011
@@ -53,7 +53,7 @@
<table width="430" cellspacing="0" cellpadding="0"
border="0" rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testejb.jsp
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testejb.jsp?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testejb.jsp
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testejb.jsp
Fri Dec 23 21:57:29 2011
@@ -65,7 +65,7 @@ java.util.Properties
<table width="530" cellspacing="0" cellpadding="0" border="0"
rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testhome.jsp
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testhome.jsp?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testhome.jsp
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testhome.jsp
Fri Dec 23 21:57:29 2011
@@ -65,7 +65,7 @@ java.io.File
<table width="530" cellspacing="0" cellpadding="0" border="0"
rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testint.jsp
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testint.jsp?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testint.jsp
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testint.jsp
Fri Dec 23 21:57:29 2011
@@ -64,7 +64,7 @@ java.util.Properties
<table width="530" cellspacing="0" cellpadding="0" border="0"
rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testsuite.jsp
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testsuite.jsp?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testsuite.jsp
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/testsuite.jsp
Fri Dec 23 21:57:29 2011
@@ -60,7 +60,7 @@ java.io.PrintStream
<table width="530" cellspacing="0" cellpadding="0" border="0"
rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewclass.jsp
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewclass.jsp?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewclass.jsp
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewclass.jsp
Fri Dec 23 21:57:29 2011
@@ -58,7 +58,7 @@ java.util.Map
<table width="530" cellspacing="0" cellpadding="0" border="0"
rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewejb.jsp
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewejb.jsp?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewejb.jsp
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewejb.jsp
Fri Dec 23 21:57:29 2011
@@ -70,7 +70,7 @@ javax.naming.InitialContext
<table width="430" cellspacing="0" cellpadding="0" border="0"
rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified:
openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewjndi.jsp
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewjndi.jsp?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewjndi.jsp
(original)
+++ openejb/trunk/openejb/tomee/tomee-webapp/src/main/webapp/viewjndi.jsp
Fri Dec 23 21:57:29 2011
@@ -64,7 +64,7 @@ java.util.Properties
<table width="430" cellspacing="0" cellpadding="0" border="0"
rows="2" cols="1">
<tr>
<td align="left" valign="top"><br>
- <img width="200" vspace="0"
src="./images/logo_ejb2.gif" hspace="0" height="55" border="0">
+ <img width="200" vspace="0"
src="images/logo_ejb2.gif" hspace="0" height="55" border="0">
<br>
<img src="images/dotTrans.gif" hspace="0"
height="7" border="0"><br>
<span class="pageTitle">
Modified: openejb/trunk/openejb/tomee/tomee-webservices/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/tomee/tomee-webservices/pom.xml?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/tomee/tomee-webservices/pom.xml (original)
+++ openejb/trunk/openejb/tomee/tomee-webservices/pom.xml Fri Dec 23
21:57:29 2011
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>tomee-webservices</artifactId>
<packaging>jar</packaging>
- <name>OpenEJB :: Assembly :: Tomcat :: Web Services</name>
+ <name>OpenEJB :: TomEE :: Web Services</name>
<description>This module contains the classes that will be added to the
catalina class loader</description>
<build>
<plugins>
Modified: openejb/trunk/openejb/utils/openejb-core-hibernate/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-core-hibernate/pom.xml?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/utils/openejb-core-hibernate/pom.xml (original)
+++ openejb/trunk/openejb/utils/openejb-core-hibernate/pom.xml Fri Dec 23
21:57:29 2011
@@ -18,14 +18,14 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>container</artifactId>
+ <artifactId>utils</artifactId>
<groupId>org.apache.openejb</groupId>
<version>4.0.0-beta-2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-core-hibernate</artifactId>
- <name>OpenEJB :: Container :: Core Hibernate</name>
+ <name>OpenEJB :: Utils :: Core Hibernate</name>
<packaging>pom</packaging>
<dependencies>
Modified: openejb/trunk/openejb/utils/openejb-core-legacy-client/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-core-legacy-client/pom.xml?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/utils/openejb-core-legacy-client/pom.xml
(original)
+++ openejb/trunk/openejb/utils/openejb-core-legacy-client/pom.xml Fri Dec
23 21:57:29 2011
@@ -3,14 +3,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
- <artifactId>container</artifactId>
+ <artifactId>utils</artifactId>
<groupId>org.apache.openejb</groupId>
<version>4.0.0-beta-2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>openejb-core-client</artifactId>
- <name>OpenEJB :: Container :: Legacy Client</name>
+ <artifactId>openejb-core-legacy-client</artifactId>
+ <name>OpenEJB :: Utils :: Legacy Client</name>
<description>
Old LocalInitialContextFactory and LocalInitialContext.
The new ones simply changed the package name to be able to use
Modified: openejb/trunk/openejb/utils/openejb-spring/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-spring/pom.xml?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/utils/openejb-spring/pom.xml (original)
+++ openejb/trunk/openejb/utils/openejb-spring/pom.xml Fri Dec 23 21:57:29
2011
@@ -22,14 +22,14 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="
http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="
http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>container</artifactId>
+ <artifactId>utils</artifactId>
<groupId>org.apache.openejb</groupId>
<version>4.0.0-beta-2-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>openejb-spring</artifactId>
<packaging>jar</packaging>
- <name>OpenEJB :: Container :: Spring</name>
+ <name>OpenEJB :: Utils :: Spring</name>
<build>
<resources>
<resource>
Modified:
openejb/trunk/openejb/utils/openejb-spring/src/main/java/org/apache/openejb/spring/SingletonContainer.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-spring/src/main/java/org/apache/openejb/spring/SingletonContainer.java?rev=1222865&r1=1222314&r2=1222865&view=diff
==============================================================================
---
openejb/trunk/openejb/utils/openejb-spring/src/main/java/org/apache/openejb/spring/SingletonContainer.java
(original)
+++
openejb/trunk/openejb/utils/openejb-spring/src/main/java/org/apache/openejb/spring/SingletonContainer.java
Fri Dec 23 21:57:29 2011
@@ -19,10 +19,7 @@ package org.apache.openejb.spring;
import java.util.Properties;
-import org.apache.openejb.OpenEJBException;
import org.apache.openejb.config.BeanTypes;
-import org.apache.openejb.config.sys.Container;
-import org.springframework.beans.factory.BeanNameAware;
@Exported
public class SingletonContainer extends AbstractContainerProvider {
Modified: openejb/trunk/openejb/utils/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/pom.xml?rev=1222865&r1=1222864&r2=1222865&view=diff
==============================================================================
--- openejb/trunk/openejb/utils/pom.xml (original)
+++ openejb/trunk/openejb/utils/pom.xml Fri Dec 23 21:57:29 2011
@@ -30,5 +30,8 @@
<modules>
<module>webdeployer</module>
<module>openejb-logging</module>
+ <module>openejb-spring</module>
+ <module>openejb-core-hibernate</module>
+ <module>openejb-core-legacy-client</module>
</modules>
</project>