[jboss-svn-commits] JBL Code SVN: r8020 - in labs/jbossesb/trunk: product product/core/listeners product/core/listeners/tests product/core/rosetta product/core/rosetta/tests product/core/rosetta/tests/resources product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests product/core/services product/core/services/tests product/install product/lib/ext qa/junit
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Dec 1 09:57:07 EST 2006
Author: kurt.stam at jboss.com
Date: 2006-12-01 09:57:02 -0500 (Fri, 01 Dec 2006)
New Revision: 8020
Added:
labs/jbossesb/trunk/product/lib/ext/jbossall-client.jar
Removed:
labs/jbossesb/trunk/product/core/rosetta/tests/resources/conf/
labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java
labs/jbossesb/trunk/product/lib/ext/ejb3/
labs/jbossesb/trunk/product/lib/ext/ejb3_embedded/
Modified:
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/core/listeners/build.xml
labs/jbossesb/trunk/product/core/listeners/tests/build.xml
labs/jbossesb/trunk/product/core/rosetta/build.xml
labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
labs/jbossesb/trunk/product/core/services/build.xml
labs/jbossesb/trunk/product/core/services/tests/build.xml
labs/jbossesb/trunk/product/install/deployment.properties-example
labs/jbossesb/trunk/qa/junit/build.xml
Log:
removing ejb3 jars and references
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2006-12-01 14:52:41 UTC (rev 8019)
+++ labs/jbossesb/trunk/product/build.xml 2006-12-01 14:57:02 UTC (rev 8020)
@@ -149,7 +149,6 @@
<classpath>
<path path="${org.jboss.esb.internal.src}"/>
<fileset dir="lib/ext" includes="*.jar" />
- <fileset dir="lib/ext/ejb3" includes="*.jar" />
</classpath>
</javadoc>
</target>
@@ -171,7 +170,6 @@
<path path="${org.jboss.esb.internal.src}"/>
<fileset dir="lib/ext" includes="*.jar" />
<fileset dir="samples/trailblazer2/banks/lib/ext" includes="*.jar"/>
- <fileset dir="lib/ext/ejb3" includes="*.jar" />
</classpath>
</javadoc>
</target>
Modified: labs/jbossesb/trunk/product/core/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/build.xml 2006-12-01 14:52:41 UTC (rev 8019)
+++ labs/jbossesb/trunk/product/core/listeners/build.xml 2006-12-01 14:57:02 UTC (rev 8020)
@@ -9,7 +9,6 @@
<property environment="env"/>
<property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
- <property name="org.jboss.esb.ejb3.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext/ejb3"/>
<condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
@@ -23,7 +22,6 @@
<pathelement location="${org.jboss.esb.classes.dir}"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/services"/>
- <fileset dir="${org.jboss.esb.ejb3.lib.dir}" includes="*.jar,*.zip"/>
</path>
<target name="org.jboss.esb.listeners.init">
Modified: labs/jbossesb/trunk/product/core/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-12-01 14:52:41 UTC (rev 8019)
+++ labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-12-01 14:57:02 UTC (rev 8020)
@@ -8,7 +8,6 @@
<property name="org.jboss.esb.tests.classes.dir" location="${org.jboss.esb.internal.dest}/tests"/>
<property name="org.jboss.esb.tests.report.dir" location="${org.jboss.esb.internal.dest}/tests/junit"/>
<property name="org.jboss.esb.root.dir" location="../.."/>
- <property name="org.jboss.esb.ejb3_embedded.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext/ejb3_embedded"/>
<property name="org.jboss.esb.module.tests.conf.dir" location="${org.jboss.esb.root.dir}/listeners/tests/resources/conf"/>
<property environment="env"/>
@@ -27,9 +26,6 @@
<pathelement location="${org.jboss.esb.module.classes.root.dir}/services"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
<pathelement location="${org.jboss.esb.module.tests.conf.dir}"/>
- <!-- Needed as the listeners import javax.jms.* -->
- <fileset dir="${org.jboss.esb.ejb3_embedded.lib.dir}" includes="jboss-ejb3-all.jar hibernate-all.jar thirdparty-all.jar"/>
-
<!--
<fileset dir="${org.jboss.esb.ext.lib.dir}"
includes="activation.jar jbossall-client.jar log4j.jar mail.jar junit.jar emma.jar emma_ant.jar"/>
Modified: labs/jbossesb/trunk/product/core/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/build.xml 2006-12-01 14:52:41 UTC (rev 8019)
+++ labs/jbossesb/trunk/product/core/rosetta/build.xml 2006-12-01 14:57:02 UTC (rev 8020)
@@ -9,14 +9,12 @@
<property environment="env"/>
<property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
- <property name="org.jboss.esb.ejb3.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext/ejb3"/>
<condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
<path id="org.jboss.esb.rosetta.base.classpath">
<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
- <fileset dir="${org.jboss.esb.ejb3.lib.dir}" includes="*.jar,*.zip"/>
</path>
<target name="org.jboss.esb.rosetta.init">
Modified: labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2006-12-01 14:52:41 UTC (rev 8019)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2006-12-01 14:57:02 UTC (rev 8020)
@@ -11,7 +11,6 @@
<property name="org.jboss.esb.module.tests.coverage.dir" location="${org.jboss.esb.internal.dest}/tests/coverage/rosetta"/>
<property name="org.jboss.esb.module.classes.instr.dir" location="${org.jboss.esb.module.tests.coverage.dir}/instr" />
<property environment="env"/>
- <property name="org.jboss.esb.ejb3_embedded.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext/ejb3_embedded"/>
<property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
<!-- Set deployment properties filename -->
<property name="org.jboss.esb.deployment.properties" location="../../../install/deployment.properties"/>
@@ -26,8 +25,6 @@
<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
<pathelement location="${org.jboss.esb.root.dir}/core/rosetta/tests/resources/etc"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
- <pathelement location="${org.jboss.esb.ejb3_conf.tests.src.dir}"/>
- <fileset dir="${org.jboss.esb.ejb3_embedded.lib.dir}" includes="jboss-ejb3-all.jar hibernate-all.jar thirdparty-all.jar"/>
</path>
<target name="org.jboss.esb.tests.init">
Deleted: labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java
===================================================================
--- labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java 2006-12-01 14:52:41 UTC (rev 8019)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/src/org/jboss/soa/esb/common/tests/EJBContainerSetup.java 2006-12-01 14:57:02 UTC (rev 8020)
@@ -1,156 +0,0 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2006, JBoss Inc., and individual contributors as indicated
-* by the @authors tag. See the copyright.txt in the distribution for a
-* full listing of individual contributors.
-*
-* This is free software; you can redistribute it and/or modify it
-* under the terms of the GNU Lesser General Public License as
-* published by the Free Software Foundation; either version 2.1 of
-* the License, or (at your option) any later version.
-*
-* This software is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-* Lesser General Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public
-* License along with this software; if not, write to the Free
-* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
-* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-*/
-package org.jboss.soa.esb.common.tests;
-
-/**
- * Special Setup class to invoke the JBoss microcontainer for testing ejb
- * code. Based a class provided by John Gilbert.
- *
- * @author kstam
- */
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NameClassPair;
-import javax.naming.NamingEnumeration;
-import javax.naming.NamingException;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-
-import org.apache.log4j.Logger;
-import org.jboss.ejb3.embedded.EJB3StandaloneBootstrap;
-import org.jboss.soa.esb.common.ModulePropertyManager;
-
-public class EJBContainerSetup extends TestSetup {
-
- private static final Logger log = Logger.getLogger(EJBContainerSetup.class);
-
- private static InitialContext initialContext;
-
- private static boolean initialized = false;
-
- public EJBContainerSetup(Test test) {
- super(test);
- }
-
- protected void setUp() {
- startupEmbeddedJboss();
- }
-
- protected void tearDown() {
- // shutdownEmbeddedJboss();
- }
-
- public static void shutdownEmbeddedJboss() {
- EJB3StandaloneBootstrap.shutdown();
- }
-
- public static void startupEmbeddedJboss() {
- try {
- if (initialized)
- return;
-
- // Boot the JBoss Microcontainer with EJB3 settings, loads
- // ejb3-interceptors-aop.xml
- EJB3StandaloneBootstrap.boot(null);
-
- log.info("scanClasspath: "
- + ModulePropertyManager.getPropertyManager(ModulePropertyManager.CORE_MODULE).getProperty("java.class.path"));
- EJB3StandaloneBootstrap.scanClasspath();
-
- // Create InitialContext from jndi.properties
- System.setProperty("java.naming.factory.initial",
- "org.jnp.interfaces.LocalOnlyContextFactory");
- System.setProperty("java.naming.factory.url.pkgs",
- "org.jboss.naming:org.jnp.interfaces");
- initialContext = new InitialContext();
-
- //printJndiTree();
-
- initialized = true;
-
- } catch (Exception ex) {
- log.error("EJB3 Container Startup Error", ex);
- throw new RuntimeException(ex);
- }
- }
-
- @SuppressWarnings("unused")
- static private void printJndiTree() throws Exception {
-
- log.info("JNDI Tree");
- NamingEnumeration e = initialContext.list("");
- while (e.hasMore()) {
- NameClassPair element = (NameClassPair) e.next();
- print(element, "");
- }
- e = initialContext.list("java:");
- while (e.hasMore()) {
- NameClassPair element = (NameClassPair) e.next();
- print(element, "");
- }
- }
-
- static private void print(NameClassPair ctx, String tab) {
- log.info(tab + ctx);
- try {
- NamingEnumeration e = initialContext.list(ctx.getName());
- while (e.hasMore()) {
- NameClassPair element = (NameClassPair) e.next();
- print(element, tab + "--> ");
- }
- } catch (NamingException e1) {
- }
- }
-
- public static Object lookup(String beanName) {
- try {
- return initialContext.lookup(beanName);
- } catch (NamingException ex) {
- throw new RuntimeException("Couldn't lookup: " + beanName, ex);
- }
- }
-
- public static Object lookup(String beanName, String user, String password) {
- InitialContext ctx = null;
- try {
- Properties env = new Properties();
- env.setProperty(Context.SECURITY_PRINCIPAL, user);
- env.setProperty(Context.SECURITY_CREDENTIALS, password);
- env.setProperty(Context.INITIAL_CONTEXT_FACTORY,
- "org.jboss.security.jndi.JndiLoginInitialContextFactory");
- ctx = new InitialContext(env);
-
- return ctx.lookup(beanName);
- } catch (NamingException ex) {
- throw new RuntimeException("Couldn't lookup: " + beanName, ex);
- } finally {
- try {
- ctx.close();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
- }
-}
Modified: labs/jbossesb/trunk/product/core/services/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/build.xml 2006-12-01 14:52:41 UTC (rev 8019)
+++ labs/jbossesb/trunk/product/core/services/build.xml 2006-12-01 14:57:02 UTC (rev 8020)
@@ -21,7 +21,6 @@
</condition>
<property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
- <property name="org.jboss.esb.ejb3.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext/ejb3"/>
<condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/lib">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
@@ -31,7 +30,6 @@
<!-- =================================================================== -->
<path id="org.jboss.esb.services.base.classpath">
<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar" excludes="jbossall-client.jar"/>
- <fileset dir="${org.jboss.esb.ejb3.lib.dir}" includes="*.jar,*.zip"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
</path>
Modified: labs/jbossesb/trunk/product/core/services/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-12-01 14:52:41 UTC (rev 8019)
+++ labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-12-01 14:57:02 UTC (rev 8020)
@@ -15,8 +15,6 @@
<property environment="env"/>
<property name="org.jboss.esb.ext.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext"/>
- <property name="org.jboss.esb.ejb3_embedded.lib.dir" location="${org.jboss.esb.root.dir}/lib/ext/ejb3_embedded"/>
- <property name="org.jboss.esb.ejb3_conf.tests.src.dir" location="${org.jboss.esb.root.dir}/rosetta/tests/resources/conf"/>
<condition property="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
@@ -29,8 +27,6 @@
<pathelement location="../rules"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
- <pathelement location="${org.jboss.esb.ejb3_conf.tests.src.dir}"/>
- <fileset dir="${org.jboss.esb.ejb3_embedded.lib.dir}" includes="*.jar"/>
</path>
<target name="org.jboss.esb.tests.init">
Modified: labs/jbossesb/trunk/product/install/deployment.properties-example
===================================================================
--- labs/jbossesb/trunk/product/install/deployment.properties-example 2006-12-01 14:52:41 UTC (rev 8019)
+++ labs/jbossesb/trunk/product/install/deployment.properties-example 2006-12-01 14:57:02 UTC (rev 8020)
@@ -10,4 +10,4 @@
# application server root directory
org.jboss.esb.appserver.home=C:/cygwin/home/kstam/apps/jboss-4.0.4.GA/jbossesb
org.jboss.esb.appserver.config=default
-org.jboss.esb.dist.lib=../build/dist/lib/
\ No newline at end of file
+org.jboss.esb.dist.lib=../build/jbossesb/lib/
\ No newline at end of file
Copied: labs/jbossesb/trunk/product/lib/ext/jbossall-client.jar (from rev 8018, labs/jbossesb/trunk/product/lib/ext/ejb3/jbossall-client.jar)
Modified: labs/jbossesb/trunk/qa/junit/build.xml
===================================================================
--- labs/jbossesb/trunk/qa/junit/build.xml 2006-12-01 14:52:41 UTC (rev 8019)
+++ labs/jbossesb/trunk/qa/junit/build.xml 2006-12-01 14:57:02 UTC (rev 8020)
@@ -3,7 +3,7 @@
<property name="product" location="../../product"/>
<property name="product.build" location="${product}/build"/>
- <property name="product.lib" location="${product.build}/dist/lib"/>
+ <property name="product.lib" location="${product.build}/jbossesb/lib"/>
<property name="coverage" location="${product.build}/tests/coverage"/>
<property name="build.lib" location="${product}/lib"/>
<property name="qa.build" location="../build"/>
@@ -18,7 +18,6 @@
excludes="*.jar" includes="jaxr-api-1.0.jar,scout-0.7rc2-embedded.jar,juddi-embedded.jar"/>
<fileset dir="${qa.lib}/ext" includes="*.jar" />
<fileset dir="${build.lib}/ext" includes="*.jar" />
- <fileset dir="${build.lib}/ext/ejb3" includes="*.jar" />
<pathelement location="../" />
</path>
More information about the jboss-svn-commits
mailing list