Author: rmannibucau
Date: Wed Nov 7 09:40:02 2012
New Revision: 1406512
URL: http://svn.apache.org/viewvc?rev=1406512&view=rev
Log:
using ear as root base context only if specified, caching a bit altdd value +
some minor cleanup
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarTest.java
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/AltDDPrefixTest.java
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Handler.java
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarTest.java?rev=1406512&r1=1406511&r2=1406512&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarTest.java
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/java/org/apache/openejb/arquillian/tests/ear/EarTest.java
Wed Nov 7 09:40:02 2012
@@ -62,7 +62,7 @@ public class EarTest {
System.out.println();
final EnterpriseArchive ear =
ShrinkWrap.create(EnterpriseArchive.class,
"red.ear").addAsModule(ejbJar).addAsModule(webapp);
- ear.addAsLibraries(JarLocation.jarLocation(Test.class));
+ //ear.addAsLibraries(JarLocation.jarLocation(Test.class));
System.out.println(ear.toString(true));
System.out.println();
@@ -74,7 +74,7 @@ public class EarTest {
public void test() throws Exception {
System.out.println(url);
- final URL servlet = new URL(url, "/red/green/blue");
+ final URL servlet = new URL(url, "/green/blue");
final String slurp = IO.slurp(servlet);
Assert.assertEquals(Test.class.getName(), slurp);
System.out.println(slurp);
Modified:
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml?rev=1406512&r1=1406511&r2=1406512&view=diff
==============================================================================
---
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml
(original)
+++
openejb/trunk/openejb/arquillian/arquillian-tomee-tests/arquillian-tomee-webprofile-tests/src/test/resources/arquillian.xml
Wed Nov 7 09:40:02 2012
@@ -30,6 +30,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests
+ openejb.ear.use-as-webcontext-base=true
</property>
</configuration>
</container>
@@ -46,6 +47,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests
+ openejb.ear.use-as-webcontext-base=true
</property>
</configuration>
</container>
@@ -61,6 +63,7 @@
My\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
My\ Unmanaged\ DataSource.JdbcUrl = jdbc:hsqldb:mem:hsqldb
openejb.classloader.forced-load=org.apache.openejb.arquillian.tests.
+ openejb.ear.use-as-webcontext-base=true
</property>
</configuration>
</container>
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1406512&r1=1406511&r2=1406512&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
Wed Nov 7 09:40:02 2012
@@ -96,6 +96,8 @@ class AppInfoBuilder {
private static final Logger logger =
Logger.getInstance(LogCategory.OPENEJB_STARTUP_CONFIG,
"org.apache.openejb.util.resources");
private static final Messages messages = new
Messages("org.apache.openejb.util.resources");
+ private static boolean USE_EAR_AS_CONTEXT_ROOT_BASE =
SystemInstance.get().getOptions().get("openejb.ear.use-as-webcontext-base",
false);
+
private final ConfigurationFactory configFactory;
private EjbJarInfoBuilder ejbJarInfoBuilder = new EjbJarInfoBuilder();
@@ -378,7 +380,7 @@ class AppInfoBuilder {
webAppInfo.host = webModule.getHost();
- if (!webModule.isStandaloneModule()) {
+ if (!webModule.isStandaloneModule() &&
USE_EAR_AS_CONTEXT_ROOT_BASE) {
webAppInfo.contextRoot = appModule.getModuleId() + "/" +
webModule.getContextRoot();
} else {
webAppInfo.contextRoot = webModule.getContextRoot();
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1406512&r1=1406511&r2=1406512&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Wed Nov 7 09:40:02 2012
@@ -47,7 +47,6 @@ import org.apache.openejb.util.Annotatio
import org.apache.openejb.util.JarExtractor;
import org.apache.openejb.util.LogCategory;
import org.apache.openejb.util.Logger;
-import org.apache.openejb.util.StringTemplate;
import org.apache.openejb.util.URLs;
import org.apache.xbean.finder.IAnnotationFinder;
import org.apache.xbean.finder.ResourceFinder;
@@ -101,6 +100,7 @@ public class DeploymentLoader implements
private static final String ddDir = "META-INF/";
private boolean scanManagedBeans = true;
private static final Collection<String> KNOWN_DESCRIPTORS =
Arrays.asList("app-ctx.xml", "module.properties", "application.properties",
"web.xml", "ejb-jar.xml", "openejb-jar.xml", "env-entries.properties",
"beans.xml", "ra.xml", "application.xml", "application-client.xml",
"persistence-fragment.xml", "persistence.xml", "validation.xml",
NewLoaderLogic.EXCLUSION_FILE);
+ private static String ALTDD =
SystemInstance.get().getOptions().get(OPENEJB_ALTDD_PREFIX, (String) null);
public AppModule load(final File jarFile) throws OpenEJBException {
// verify we have a valid file
@@ -1272,11 +1272,9 @@ public class DeploymentLoader implements
* @return the same map instance updated with alt dds
*/
public static Map<String, URL> altDDSources(final Map<String, URL> map,
final boolean log) {
- final String prefixes =
SystemInstance.get().getOptions().get(OPENEJB_ALTDD_PREFIX, (String) null);
+ if (ALTDD == null || ALTDD.length() <= 0) return map;
- if (prefixes == null || prefixes.length() <= 0) return map;
-
- final List<String> list = new
ArrayList<String>(Arrays.asList(prefixes.split(",")));
+ final List<String> list = new
ArrayList<String>(Arrays.asList(ALTDD.split(",")));
Collections.reverse(list);
final Map<String, URL> alts = new HashMap<String, URL>();
@@ -1595,4 +1593,7 @@ public class DeploymentLoader implements
return baseUrl;
}
+ public static void reloadAltDD() {
+ ALTDD = SystemInstance.get().getOptions().get(OPENEJB_ALTDD_PREFIX,
(String) null);
+ }
}
Modified:
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/AltDDPrefixTest.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/AltDDPrefixTest.java?rev=1406512&r1=1406511&r2=1406512&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/AltDDPrefixTest.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/test/java/org/apache/openejb/config/AltDDPrefixTest.java
Wed Nov 7 09:40:02 2012
@@ -45,6 +45,7 @@ public class AltDDPrefixTest extends Tes
System.out.println("*** testTestOnlyModule ***");
Assembler assmbler = new Assembler();
SystemInstance.get().setProperty("openejb.altdd.prefix", "test");
+ DeploymentLoader.reloadAltDD();
ConfigurationFactory factory = new ConfigurationFactory();
URL resource =
AltDDPrefixTest.class.getClassLoader().getResource("altddapp1");
@@ -58,6 +59,7 @@ public class AltDDPrefixTest extends Tes
System.out.println("*** testMultitplePrefixes ***");
Assembler assmbler = new Assembler();
SystemInstance.get().setProperty("openejb.altdd.prefix", "footest,
test");
+ DeploymentLoader.reloadAltDD();
ConfigurationFactory factory = new ConfigurationFactory();
URL resource =
AltDDPrefixTest.class.getClassLoader().getResource("altddapp2");
@@ -89,6 +91,7 @@ public class AltDDPrefixTest extends Tes
System.out.println("*** testPersistenceUnit ***");
Assembler assmbler = new Assembler();
SystemInstance.get().setProperty("openejb.altdd.prefix", "footest,
test");
+ DeploymentLoader.reloadAltDD();
ConfigurationFactory factory = new ConfigurationFactory();
URL resource =
AltDDPrefixTest.class.getClassLoader().getResource("altddPU1");
@@ -115,6 +118,7 @@ public class AltDDPrefixTest extends Tes
Assembler assmbler = new Assembler();
// TODO should be better to add a remove property method
SystemInstance.get().getProperties().remove("openejb.altdd.prefix");
+ DeploymentLoader.reloadAltDD();
ConfigurationFactory factory = new ConfigurationFactory();
URL resource =
AltDDPrefixTest.class.getClassLoader().getResource("altddPU1");
Modified:
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Handler.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Handler.java?rev=1406512&r1=1406511&r2=1406512&view=diff
==============================================================================
---
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Handler.java
(original)
+++
openejb/trunk/openejb/utils/openejb-provisionning/src/main/java/org/apache/openejb/resolver/maven/Handler.java
Wed Nov 7 09:40:02 2012
@@ -16,10 +16,6 @@
*/
package org.apache.openejb.resolver.maven;
-import org.ops4j.pax.url.maven.commons.MavenConfigurationImpl;
-import org.ops4j.pax.url.maven.commons.MavenSettingsImpl;
-import org.ops4j.util.property.PropertiesPropertyResolver;
-
import java.io.IOException;
import java.net.URL;
import java.net.URLConnection;
