Author: dblevins
Date: Fri Dec 14 15:00:20 2007
New Revision: 604326
URL: http://svn.apache.org/viewvc?rev=604326&view=rev
Log:
Moved LinkResolver to util since it's no longer used in the Assembler anymore
and is by a few other modules
Added:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java
(contents, props changed)
- copied, changed from r602803,
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LinkResolver.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java
(contents, props changed)
- copied, changed from r602802,
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/UniqueDefaultLinkResolver.java
Removed:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LinkResolver.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/UniqueDefaultLinkResolver.java
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatWebAppBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/LinkResolverTest.java
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java?rev=604326&r1=604325&r2=604326&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatJndiBuilder.java
Fri Dec 14 15:00:20 2007
@@ -34,7 +34,6 @@
import org.apache.openejb.assembler.classic.EjbLocalReferenceInfo;
import org.apache.openejb.assembler.classic.EjbReferenceInfo;
import org.apache.openejb.assembler.classic.EnvEntryInfo;
-import org.apache.openejb.assembler.classic.LinkResolver;
import org.apache.openejb.assembler.classic.PersistenceContextReferenceInfo;
import org.apache.openejb.assembler.classic.PersistenceUnitReferenceInfo;
import org.apache.openejb.assembler.classic.PortRefInfo;
Modified:
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatWebAppBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatWebAppBuilder.java?rev=604326&r1=604325&r2=604326&view=diff
==============================================================================
---
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatWebAppBuilder.java
(original)
+++
openejb/trunk/openejb3/assembly/openejb-tomcat/src/main/java/org/apache/openejb/tomcat/TomcatWebAppBuilder.java
Fri Dec 14 15:00:20 2007
@@ -41,7 +41,7 @@
import org.apache.openejb.server.webservices.WsServlet;
import org.apache.openejb.assembler.classic.AppInfo;
import org.apache.openejb.assembler.classic.Assembler;
-import org.apache.openejb.assembler.classic.LinkResolver;
+import org.apache.openejb.util.LinkResolver;
import org.apache.openejb.assembler.classic.WebAppBuilder;
import org.apache.openejb.assembler.classic.WebAppInfo;
import org.apache.openejb.assembler.classic.EjbJarInfo;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java?rev=604326&r1=604325&r2=604326&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
Fri Dec 14 15:00:20 2007
@@ -21,8 +21,8 @@
import org.apache.openejb.config.sys.Resource;
import org.apache.openejb.assembler.classic.ContainerInfo;
import org.apache.openejb.assembler.classic.ResourceInfo;
-import org.apache.openejb.assembler.classic.LinkResolver;
-import org.apache.openejb.assembler.classic.UniqueDefaultLinkResolver;
+import org.apache.openejb.util.LinkResolver;
+import org.apache.openejb.util.UniqueDefaultLinkResolver;
import org.apache.openejb.jee.MessageDrivenBean;
import org.apache.openejb.jee.ActivationConfig;
import org.apache.openejb.jee.EnterpriseBean;
Modified:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java?rev=604326&r1=604325&r2=604326&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/JndiEncInfoBuilder.java
Fri Dec 14 15:00:20 2007
@@ -25,7 +25,7 @@
import org.apache.openejb.assembler.classic.EnvEntryInfo;
import org.apache.openejb.assembler.classic.InjectionInfo;
import org.apache.openejb.assembler.classic.JndiEncInfo;
-import org.apache.openejb.assembler.classic.LinkResolver;
+import org.apache.openejb.util.LinkResolver;
import org.apache.openejb.assembler.classic.PersistenceContextReferenceInfo;
import org.apache.openejb.assembler.classic.PersistenceUnitReferenceInfo;
import org.apache.openejb.assembler.classic.PortRefInfo;
@@ -33,7 +33,6 @@
import org.apache.openejb.assembler.classic.ResourceEnvReferenceInfo;
import org.apache.openejb.assembler.classic.ResourceReferenceInfo;
import org.apache.openejb.assembler.classic.ServiceReferenceInfo;
-import org.apache.openejb.assembler.classic.PersistenceUnitInfo;
import org.apache.openejb.jee.EjbLocalRef;
import org.apache.openejb.jee.EjbRef;
import org.apache.openejb.jee.EnvEntry;
Copied:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java
(from r602803,
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LinkResolver.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java?p2=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java&p1=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LinkResolver.java&r1=602803&r2=604326&rev=604326&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/LinkResolver.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java
Fri Dec 14 15:00:20 2007
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.openejb.assembler.classic;
+package org.apache.openejb.util;
import java.util.ArrayList;
import java.util.Collection;
Propchange:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/LinkResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Copied:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java
(from r602802,
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/UniqueDefaultLinkResolver.java)
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java?p2=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java&p1=openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/UniqueDefaultLinkResolver.java&r1=602802&r2=604326&rev=604326&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/UniqueDefaultLinkResolver.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java
Fri Dec 14 15:00:20 2007
@@ -18,7 +18,9 @@
*/
-package org.apache.openejb.assembler.classic;
+package org.apache.openejb.util;
+
+import org.apache.openejb.util.LinkResolver;
import java.net.URI;
Propchange:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Rev Author Id Revision HeadURL
Propchange:
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/util/UniqueDefaultLinkResolver.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified:
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/LinkResolverTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/LinkResolverTest.java?rev=604326&r1=604325&r2=604326&view=diff
==============================================================================
---
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/LinkResolverTest.java
(original)
+++
openejb/trunk/openejb3/container/openejb-core/src/test/java/org/apache/openejb/assembler/classic/LinkResolverTest.java
Fri Dec 14 15:00:20 2007
@@ -16,12 +16,10 @@
*/
package org.apache.openejb.assembler.classic;
-import java.util.Map;
import java.net.URI;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityManager;
import junit.framework.TestCase;
+import org.apache.openejb.util.LinkResolver;
public class LinkResolverTest extends TestCase {
