Author: rmannibucau Date: Sat Aug 23 17:49:40 2014 New Revision: 1620059 URL: http://svn.apache.org/r1620059 Log: removing staging repo from pom - break the build locally -, using jar in place when local in provisining util, fixing another test - passed by luck before?
Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java tomee/tomee/trunk/pom.xml Modified: tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java?rev=1620059&r1=1620058&r2=1620059&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java (original) +++ tomee/tomee/trunk/container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java Sat Aug 23 17:49:40 2014 @@ -44,7 +44,7 @@ public class AlternateDriverJarTest { @Configuration public Properties config() { - final File drivers = new File(new File(System.getProperty("openejb.home")).getParentFile(), "drivers").getAbsoluteFile(); + final File drivers = new File(".", "drivers").getAbsoluteFile(); final Properties p = new Properties(); p.put("openejb.jdbc.datasource-creator", "dbcp-alternative"); Modified: tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java?rev=1620059&r1=1620058&r2=1620059&view=diff ============================================================================== --- tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java (original) +++ tomee/tomee/trunk/container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java Sat Aug 23 17:49:40 2014 @@ -153,11 +153,11 @@ public final class ProvisioningUtil { try { final File file = cacheFile(lastPart(rawLocation)); final File local = new File(rawLocation); - if (local.isDirectory()) { + if (local.exists()) { return local.getAbsolutePath(); } - final URL url = local.isFile() ? local.toURI().toURL() : new URL(rawLocation); + final URL url = new URL(rawLocation); InputStream is = null; try { is = new BufferedInputStream(url.openStream()); Modified: tomee/tomee/trunk/pom.xml URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/pom.xml?rev=1620059&r1=1620058&r2=1620059&view=diff ============================================================================== --- tomee/tomee/trunk/pom.xml (original) +++ tomee/tomee/trunk/pom.xml Sat Aug 23 17:49:40 2014 @@ -479,16 +479,6 @@ <repositories> <repository> <snapshots> - <enabled>false</enabled> - </snapshots> - <releases> - <enabled>true</enabled> - </releases> - <id>Apache Staging</id> - <url>https://repository.apache.org/service/local/staging/deploy/maven2</url> - </repository> - <repository> - <snapshots> <enabled>true</enabled> </snapshots> <releases>