You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2014/08/23 19:49:40 UTC
svn commit: r1620059 - in /tomee/tomee/trunk:
container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
pom.xml
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>
Re: svn commit: r1620059 - in /tomee/tomee/trunk: container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
pom.xml
Posted by Thiago Veronezi <th...@veronezi.org>.
I built fleece locally... now tomee builds OK.
On Tue, Aug 26, 2014 at 3:20 AM, Romain Manni-Bucau <rm...@gmail.com>
wrote:
> well I can't now but we should ask infra about it
>
> if you add it back then I'll not be able to build too and we clearly
> shouldn't rely on these artifacts - even if building from an empty
> repo will pop out issues
>
> you can also just add it in settings.xml, no?
>
>
> Romain Manni-Bucau
> Twitter: @rmannibucau
> Blog: http://rmannibucau.wordpress.com/
> LinkedIn: http://fr.linkedin.com/in/rmannibucau
> Github: https://github.com/rmannibucau
>
>
> 2014-08-26 9:13 GMT+02:00 Jean-Louis Monteiro <jl...@tomitribe.com>:
> > I have the same issue.
> > So yes please, otherwise, I'll do now
> >
> > --
> > Jean-Louis Monteiro
> > http://twitter.com/jlouismonteiro
> > http://www.tomitribe.com
> >
> >
> > On Tue, Aug 26, 2014 at 6:56 AM, Romain Manni-Bucau <
> rmannibucau@gmail.com>
> > wrote:
> >
> >> Well this was totally breaking the build locally for me.
> >>
> >> Batchee should be on repo1, fleece is in snapshots repo. Maybe it was
> clean
> >> up, I can redeploy it if needed
> >> Le 26 août 2014 02:02, "Thiago Veronezi" <th...@veronezi.org> a écrit
> :
> >>
> >> > Hmmmm... I see some known names in these projects. ;)
> >> > I cant find "org.apache.fleece:fleece:pom". Can you guys check it out?
> >> >
> >> > []s,
> >> > Thiago.
> >> >
> >> >
> >> >
> >> > On Mon, Aug 25, 2014 at 8:44 PM, Thiago Veronezi <thiago@veronezi.org
> >
> >> > wrote:
> >> >
> >> > > I need it otherwise a clean m2 build wont pass.
> >> > >
> >> > > http://fleece.incubator.apache.org/distribution-management.html
> >> > > http://batchee.incubator.apache.org/distribution-management.html
> >> > >
> >> > >
> >> > > On Sat, Aug 23, 2014 at 1:49 PM, <rm...@apache.org> wrote:
> >> > >
> >> > >> 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>
> >> > >>
> >> > >>
> >> > >>
> >> > >
> >> >
> >>
>
Re: svn commit: r1620059 - in /tomee/tomee/trunk: container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
pom.xml
Posted by Romain Manni-Bucau <rm...@gmail.com>.
well I can't now but we should ask infra about it
if you add it back then I'll not be able to build too and we clearly
shouldn't rely on these artifacts - even if building from an empty
repo will pop out issues
you can also just add it in settings.xml, no?
Romain Manni-Bucau
Twitter: @rmannibucau
Blog: http://rmannibucau.wordpress.com/
LinkedIn: http://fr.linkedin.com/in/rmannibucau
Github: https://github.com/rmannibucau
2014-08-26 9:13 GMT+02:00 Jean-Louis Monteiro <jl...@tomitribe.com>:
> I have the same issue.
> So yes please, otherwise, I'll do now
>
> --
> Jean-Louis Monteiro
> http://twitter.com/jlouismonteiro
> http://www.tomitribe.com
>
>
> On Tue, Aug 26, 2014 at 6:56 AM, Romain Manni-Bucau <rm...@gmail.com>
> wrote:
>
>> Well this was totally breaking the build locally for me.
>>
>> Batchee should be on repo1, fleece is in snapshots repo. Maybe it was clean
>> up, I can redeploy it if needed
>> Le 26 août 2014 02:02, "Thiago Veronezi" <th...@veronezi.org> a écrit :
>>
>> > Hmmmm... I see some known names in these projects. ;)
>> > I cant find "org.apache.fleece:fleece:pom". Can you guys check it out?
>> >
>> > []s,
>> > Thiago.
>> >
>> >
>> >
>> > On Mon, Aug 25, 2014 at 8:44 PM, Thiago Veronezi <th...@veronezi.org>
>> > wrote:
>> >
>> > > I need it otherwise a clean m2 build wont pass.
>> > >
>> > > http://fleece.incubator.apache.org/distribution-management.html
>> > > http://batchee.incubator.apache.org/distribution-management.html
>> > >
>> > >
>> > > On Sat, Aug 23, 2014 at 1:49 PM, <rm...@apache.org> wrote:
>> > >
>> > >> 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>
>> > >>
>> > >>
>> > >>
>> > >
>> >
>>
Re: svn commit: r1620059 - in /tomee/tomee/trunk: container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
pom.xml
Posted by Jean-Louis Monteiro <jl...@tomitribe.com>.
I have the same issue.
So yes please, otherwise, I'll do now
--
Jean-Louis Monteiro
http://twitter.com/jlouismonteiro
http://www.tomitribe.com
On Tue, Aug 26, 2014 at 6:56 AM, Romain Manni-Bucau <rm...@gmail.com>
wrote:
> Well this was totally breaking the build locally for me.
>
> Batchee should be on repo1, fleece is in snapshots repo. Maybe it was clean
> up, I can redeploy it if needed
> Le 26 août 2014 02:02, "Thiago Veronezi" <th...@veronezi.org> a écrit :
>
> > Hmmmm... I see some known names in these projects. ;)
> > I cant find "org.apache.fleece:fleece:pom". Can you guys check it out?
> >
> > []s,
> > Thiago.
> >
> >
> >
> > On Mon, Aug 25, 2014 at 8:44 PM, Thiago Veronezi <th...@veronezi.org>
> > wrote:
> >
> > > I need it otherwise a clean m2 build wont pass.
> > >
> > > http://fleece.incubator.apache.org/distribution-management.html
> > > http://batchee.incubator.apache.org/distribution-management.html
> > >
> > >
> > > On Sat, Aug 23, 2014 at 1:49 PM, <rm...@apache.org> wrote:
> > >
> > >> 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>
> > >>
> > >>
> > >>
> > >
> >
>
Re: svn commit: r1620059 - in /tomee/tomee/trunk: container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
pom.xml
Posted by Romain Manni-Bucau <rm...@gmail.com>.
Well this was totally breaking the build locally for me.
Batchee should be on repo1, fleece is in snapshots repo. Maybe it was clean
up, I can redeploy it if needed
Le 26 août 2014 02:02, "Thiago Veronezi" <th...@veronezi.org> a écrit :
> Hmmmm... I see some known names in these projects. ;)
> I cant find "org.apache.fleece:fleece:pom". Can you guys check it out?
>
> []s,
> Thiago.
>
>
>
> On Mon, Aug 25, 2014 at 8:44 PM, Thiago Veronezi <th...@veronezi.org>
> wrote:
>
> > I need it otherwise a clean m2 build wont pass.
> >
> > http://fleece.incubator.apache.org/distribution-management.html
> > http://batchee.incubator.apache.org/distribution-management.html
> >
> >
> > On Sat, Aug 23, 2014 at 1:49 PM, <rm...@apache.org> wrote:
> >
> >> 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>
> >>
> >>
> >>
> >
>
Re: svn commit: r1620059 - in /tomee/tomee/trunk: container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
pom.xml
Posted by Thiago Veronezi <th...@veronezi.org>.
Hmmmm... I see some known names in these projects. ;)
I cant find "org.apache.fleece:fleece:pom". Can you guys check it out?
[]s,
Thiago.
On Mon, Aug 25, 2014 at 8:44 PM, Thiago Veronezi <th...@veronezi.org>
wrote:
> I need it otherwise a clean m2 build wont pass.
>
> http://fleece.incubator.apache.org/distribution-management.html
> http://batchee.incubator.apache.org/distribution-management.html
>
>
> On Sat, Aug 23, 2014 at 1:49 PM, <rm...@apache.org> wrote:
>
>> 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>
>>
>>
>>
>
Re: svn commit: r1620059 - in /tomee/tomee/trunk: container/openejb-core/src/test/java/org/apache/openejb/resource/jdbc/driver/AlternateDriverJarTest.java
container/openejb-loader/src/main/java/org/apache/openejb/loader/ProvisioningUtil.java
pom.xml
Posted by Thiago Veronezi <th...@veronezi.org>.
I need it otherwise a clean m2 build wont pass.
http://fleece.incubator.apache.org/distribution-management.html
http://batchee.incubator.apache.org/distribution-management.html
On Sat, Aug 23, 2014 at 1:49 PM, <rm...@apache.org> wrote:
> 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>
>
>
>