You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by tv...@apache.org on 2014/08/02 16:22:54 UTC
svn commit: r1615317 - in /tomee/tomee/trunk: ./ arquillian/ assembly/
container/openejb-core/
container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/
container/openejb-loader/src/main/java/org/apache/openejb/loader/ itests/
tck/
Author: tveronezi
Date: Sat Aug 2 14:22:54 2014
New Revision: 1615317
URL: http://svn.apache.org/r1615317
Log:
-No jacoco. We will use https://analysis.apache.org/
-Removing some unused code
-Fixing some old TODOs
Modified:
tomee/tomee/trunk/arquillian/pom.xml
tomee/tomee/trunk/assembly/pom.xml
tomee/tomee/trunk/container/openejb-core/pom.xml
tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/LoaderRuntimeException.java
tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
tomee/tomee/trunk/itests/pom.xml
tomee/tomee/trunk/pom.xml
tomee/tomee/trunk/tck/pom.xml
Modified: tomee/tomee/trunk/arquillian/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/pom.xml?rev=1615317&r1=1615316&r2=1615317&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/pom.xml (original)
+++ tomee/tomee/trunk/arquillian/pom.xml Sat Aug 2 14:22:54 2014
@@ -31,10 +31,6 @@
<packaging>pom</packaging>
<name>OpenEJB :: Arquillian Adaptors Parent</name>
- <properties>
- <test.coverage.skip>true</test.coverage.skip>
- </properties>
-
<modules>
<module>arquillian-common</module>
<module>arquillian-tomee-common</module>
Modified: tomee/tomee/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/assembly/pom.xml?rev=1615317&r1=1615316&r2=1615317&view=diff
==============================================================================
--- tomee/tomee/trunk/assembly/pom.xml (original)
+++ tomee/tomee/trunk/assembly/pom.xml Sat Aug 2 14:22:54 2014
@@ -28,9 +28,6 @@
<artifactId>assembly</artifactId>
<packaging>pom</packaging>
<name>OpenEJB :: Assembly</name>
- <properties>
- <test.coverage.skip>true</test.coverage.skip>
- </properties>
<modules>
<module>openejb-standalone</module>
<module>openejb-lite</module>
Modified: tomee/tomee/trunk/container/openejb-core/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/pom.xml?rev=1615317&r1=1615316&r2=1615317&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/pom.xml (original)
+++ tomee/tomee/trunk/container/openejb-core/pom.xml Sat Aug 2 14:22:54 2014
@@ -32,8 +32,6 @@
<packaging>jar</packaging>
<name>OpenEJB :: Container :: Core</name>
<properties>
- <!-- jacoco doesn't play well with the core tests -->
- <test.coverage.skip>true</test.coverage.skip>
<openejb.osgi.import.pkg>
javax.annotation;version="[1.1.0,2.0.0)",
javax.annotation.security;version="[1.1.0,2.0.0)",
Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java?rev=1615317&r1=1615316&r2=1615317&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/assembler/classic/Assembler.java Sat Aug 2 14:22:54 2014
@@ -641,7 +641,7 @@ public class Assembler extends Assembler
return createApplication(appInfo, classLoader, true);
}
- public AppContext createApplication(final AppInfo appInfo, ClassLoader classLoader, final boolean start) throws OpenEJBException, IOException, NamingException {
+ private AppContext createApplication(final AppInfo appInfo, ClassLoader classLoader, final boolean start) throws OpenEJBException, IOException, NamingException {
// The path is used in the UrlCache, command line deployer, JNDI name templates, tomcat integration and a few other places
if (appInfo.appId == null) {
throw new IllegalArgumentException("AppInfo.appId cannot be null");
@@ -654,13 +654,6 @@ public class Assembler extends Assembler
logger.info("createApplication.start", appInfo.path);
- // try {
- // Thread.sleep(5000);
- // } catch (InterruptedException e) {
- // e.printStackTrace();
- // Thread.interrupted();
- // }
-
// To start out, ensure we don't already have any beans deployed with duplicate IDs. This
// is a conflict we can't handle.
final List<String> used = new ArrayList<String>();
Modified: tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/LoaderRuntimeException.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/LoaderRuntimeException.java?rev=1615317&r1=1615316&r2=1615317&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/LoaderRuntimeException.java (original)
+++ tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/LoaderRuntimeException.java Sat Aug 2 14:22:54 2014
@@ -17,10 +17,6 @@
package org.apache.openejb.loader;
public class LoaderRuntimeException extends RuntimeException {
- public LoaderRuntimeException(final String str) {
- super(str);
- }
-
public LoaderRuntimeException(final String str, final Throwable e) {
super(str, e);
}
Modified: tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java?rev=1615317&r1=1615316&r2=1615317&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java (original)
+++ tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/SystemInstance.java Sat Aug 2 14:22:54 2014
@@ -50,21 +50,14 @@ public final class SystemInstance {
private final Options options;
- /**
- * Properties that need to be set to System via {@link System#setProperty(String, String)}
- * FIXME: Some properties are doubled in internal and external prop sets, but it simplifies get's
- */
- private final Properties externalProperties = new Properties();
-
private final FileUtils home;
private final FileUtils base;
private final ClassLoader classLoader;
- private final HashMap<Class, Object> components;
+ private final Map<Class, Object> components;
private final ClassPath classPath;
private final ObserverManager observerManager = new ObserverManager();
- // FIXME: Why is Exception thrown at all? It's almost impossible that it'll happen.
- private SystemInstance(final Properties properties) throws Exception {
+ private SystemInstance(final Properties properties) {
this.components = new HashMap<Class, Object>();
// import JVM system property config (if a resource/container/... is set through this way)
@@ -114,20 +107,23 @@ public final class SystemInstance {
}
this.internalProperties.put(e.getKey(), e.getValue());
}
-
this.internalProperties.putAll(properties);
-
this.options = new Options(internalProperties, new Options(System.getProperties()));
this.home = new FileUtils("openejb.home", "user.dir", this.internalProperties);
this.base = new FileUtils("openejb.base", "openejb.home", this.internalProperties);
this.classPath = ClassPathFactory.createClassPath(this.internalProperties.getProperty("openejb.loader", "context"));
this.classLoader = classPath.getClassLoader();
-
- this.internalProperties.setProperty("openejb.home", home.getDirectory().getCanonicalPath());
- this.internalProperties.setProperty("openejb.base", base.getDirectory().getCanonicalPath());
- System.setProperty("derby.system.home", System.getProperty("derby.system.home", base.getDirectory().getCanonicalPath()));
-
-
+ final String homeDirCanonicalPath;
+ final String baseDirCanonicalPath;
+ try {
+ homeDirCanonicalPath = home.getDirectory().getCanonicalPath();
+ baseDirCanonicalPath = base.getDirectory().getCanonicalPath();
+ } catch (IOException e) {
+ throw new LoaderRuntimeException("Failed to create default instance of SystemInstance", e);
+ }
+ this.internalProperties.setProperty("openejb.home", homeDirCanonicalPath);
+ this.internalProperties.setProperty("openejb.base", baseDirCanonicalPath);
+ System.setProperty("derby.system.home", System.getProperty("derby.system.home", baseDirCanonicalPath));
}
public <E> E fireEvent(final E event) {
@@ -174,7 +170,6 @@ public final class SystemInstance {
*/
public Object setProperty(final String key, final String value, final boolean isExternalProperty) {
if (isExternalProperty) {
- this.externalProperties.setProperty(key, value);
System.setProperty(key, value);
}
return internalProperties.setProperty(key, value);
Modified: tomee/tomee/trunk/itests/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/itests/pom.xml?rev=1615317&r1=1615316&r2=1615317&view=diff
==============================================================================
--- tomee/tomee/trunk/itests/pom.xml (original)
+++ tomee/tomee/trunk/itests/pom.xml Sat Aug 2 14:22:54 2014
@@ -33,10 +33,6 @@
<packaging>pom</packaging>
<name>OpenEJB :: iTests</name>
- <properties>
- <test.coverage.skip>true</test.coverage.skip>
- </properties>
-
<modules>
<module>failover</module>
<module>failover-ejb</module>
Modified: tomee/tomee/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1615317&r1=1615316&r2=1615317&view=diff
==============================================================================
--- tomee/tomee/trunk/pom.xml (original)
+++ tomee/tomee/trunk/pom.xml Sat Aug 2 14:22:54 2014
@@ -93,9 +93,6 @@
</scm>
<properties>
- <test.complexity.coverage.minimun>0</test.complexity.coverage.minimun>
- <test.branch.coverage.minimun>0</test.branch.coverage.minimun>
- <test.coverage.skip>false</test.coverage.skip>
<openejb.version>5.0.0-SNAPSHOT</openejb.version>
<tomee.version>2.0.0-SNAPSHOT</tomee.version>
@@ -477,59 +474,6 @@
<module>utils</module>
<module>tomee</module>
</modules>
- <build>
- <plugins>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <version>0.7.1.201405082137</version>
- <executions>
- <execution>
- <id>default-prepare-agent</id>
- <goals>
- <goal>prepare-agent</goal>
- </goals>
- <configuration>
- <skip>${test.coverage.skip}</skip>
- </configuration>
- </execution>
- <execution>
- <id>default-report</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>report</goal>
- </goals>
- </execution>
- <execution>
- <id>default-check</id>
- <goals>
- <goal>check</goal>
- </goals>
- <configuration>
- <rules>
- <rule>
- <element>BUNDLE</element>
- <limits>
- <limit>
- <counter>COMPLEXITY</counter>
- <value>COVEREDRATIO</value>
- <minimum>${test.complexity.coverage.minimun}</minimum>
- </limit>
- <limit>
- <counter>BRANCH</counter>
- <value>COVEREDRATIO</value>
- <minimum>${test.branch.coverage.minimun}</minimum>
- </limit>
-
- </limits>
- </rule>
- </rules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
</profile>
<profile>
<id>quick</id>
Modified: tomee/tomee/trunk/tck/pom.xml
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/tck/pom.xml?rev=1615317&r1=1615316&r2=1615317&view=diff
==============================================================================
--- tomee/tomee/trunk/tck/pom.xml (original)
+++ tomee/tomee/trunk/tck/pom.xml Sat Aug 2 14:22:54 2014
@@ -26,10 +26,6 @@
<packaging>pom</packaging>
<name>OpenEJB :: TCK</name>
- <properties>
- <test.coverage.skip>true</test.coverage.skip>
- </properties>
-
<modules>
<module>cdi-embedded</module>
<module>cdi-tomee</module>