You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by lr...@apache.org on 2007/06/28 02:03:01 UTC
svn commit: r551409 - in
/incubator/tuscany/java/sca/modules/implementation-bpel: lib/
lib/maven-artifact-ant-2.0.4-dep.jar pom.xml
src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
Author: lresende
Date: Wed Jun 27 17:03:00 2007
New Revision: 551409
URL: http://svn.apache.org/viewvc?view=rev&rev=551409
Log:
TTUSCANY-1394 - Applying patch from Mathieu Riou
Added:
incubator/tuscany/java/sca/modules/implementation-bpel/lib/
incubator/tuscany/java/sca/modules/implementation-bpel/lib/maven-artifact-ant-2.0.4-dep.jar (with props)
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
Added: incubator/tuscany/java/sca/modules/implementation-bpel/lib/maven-artifact-ant-2.0.4-dep.jar
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/lib/maven-artifact-ant-2.0.4-dep.jar?view=auto&rev=551409
==============================================================================
Binary file - no diff available.
Propchange: incubator/tuscany/java/sca/modules/implementation-bpel/lib/maven-artifact-ant-2.0.4-dep.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml?view=diff&rev=551409&r1=551408&r2=551409
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml Wed Jun 27 17:03:00 2007
@@ -102,42 +102,42 @@
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-epr</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-dao</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-dao</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-dao-jpa</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-runtime</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-api</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-bpel-scheduler-quartz</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
<artifactId>ode-utils</artifactId>
- <version>1.1-SNAPSHOT</version>
+ <version>1.0-incubating</version>
</dependency>
<!-- ODE Dependencies -->
@@ -213,4 +213,26 @@
</dependency>
</dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+
+ <executions>
+ <execution>
+ <phase>test-compile</phase>
+ <goals><goal>run</goal></goals>
+ <configuration>
+ <tasks>
+ <ant antfile="build.xml" target="test-db" inheritRefs="true"/>
+ </tasks>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
Modified: incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
URL: http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java?view=diff&rev=551409&r1=551408&r2=551409
==============================================================================
--- incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java (original)
+++ incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java Wed Jun 27 17:03:00 2007
@@ -32,6 +32,7 @@
import java.util.concurrent.Executors;
import java.util.concurrent.ExecutorService;
import java.io.File;
+import java.net.URL;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -56,7 +57,12 @@
public void init() throws ODEInitializationException {
_config = new OdeConfigProperties(new Properties(), "ode-sca");
- _workRoot = new File("ode-work");
+
+ // Setting work root as the directory containing our database (wherever in the classpath)
+ URL dbLocation = getClass().getClassLoader().getResource("jpadb");
+ if (dbLocation == null)
+ throw new ODEInitializationException("Couldn't find database in the classpath");
+ _workRoot = new File(dbLocation.getFile()).getParentFile();
initTxMgr();
initPersistence();
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-commits-help@ws.apache.org
Re: svn commit: r551409 - in /incubator/tuscany/java/sca/modules/implementation-bpel: lib/ lib/maven-artifact-ant-2.0.4-dep.jar pom.xml src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
Posted by Luciano Resende <lu...@gmail.com>.
I have changed this to use the maven plugin for unpack the ODE DB and
removed the lib directory. This was done under revision #551630.
On 6/28/07, ant elder <an...@apache.org> wrote:
> How come this ant jar needs to be checked into our svn and can't be got like
> usual maven dependencies? (just trying to understand whats going on)
>
> ...ant
>
> On 6/28/07, lresende@apache.org <lr...@apache.org> wrote:
> >
> > Author: lresende
> > Date: Wed Jun 27 17:03:00 2007
> > New Revision: 551409
> >
> > URL: http://svn.apache.org/viewvc?view=rev&rev=551409
> > Log:
> > TTUSCANY-1394 - Applying patch from Mathieu Riou
> >
> > Added:
> > incubator/tuscany/java/sca/modules/implementation-bpel/lib/
> > incubator/tuscany/java/sca/modules/implementation-bpel/lib/maven-
> > artifact-ant-2.0.4-dep.jar (with props)
> > Modified:
> > incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
> > incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
> >
> >
> > Added: incubator/tuscany/java/sca/modules/implementation-bpel/lib/maven-
> > artifact-ant-2.0.4-dep.jar
> > URL:
> > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/lib/maven-artifact-ant-2.0.4-dep.jar?view=auto&rev=551409
> > ==============================================================================
> >
> > Binary file - no diff available.
> >
> > Propchange:
> > incubator/tuscany/java/sca/modules/implementation-bpel/lib/maven-
> > artifact-ant-2.0.4-dep.jar
> > ------------------------------------------------------------------------------
> >
> > svn:mime-type = application/octet-stream
> >
> > Modified: incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
> > URL:
> > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml?view=diff&rev=551409&r1=551408&r2=551409
> > ==============================================================================
> >
> > --- incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
> > (original)
> > +++ incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml Wed Jun
> > 27 17:03:00 2007
> > @@ -102,42 +102,42 @@
> > <dependency>
> > <groupId>org.apache.ode</groupId>
> > <artifactId>ode-bpel-epr</artifactId>
> > - <version>1.1-SNAPSHOT</version>
> > + <version>1.0-incubating </version>
> > </dependency>
> > <dependency>
> > <groupId>org.apache.ode</groupId>
> > <artifactId>ode-bpel-dao</artifactId>
> > - <version> 1.1-SNAPSHOT</version>
> > + <version>1.0-incubating</version>
> > </dependency>
> > <dependency>
> > <groupId>org.apache.ode</groupId>
> > <artifactId>ode-bpel-dao</artifactId>
> > - <version>1.1-SNAPSHOT</version>
> > + <version>1.0-incubating</version>
> > </dependency>
> > <dependency>
> > <groupId>org.apache.ode </groupId>
> > <artifactId>ode-dao-jpa</artifactId>
> > - <version>1.1-SNAPSHOT</version>
> > + <version>1.0-incubating</version>
> > </dependency>
> > <dependency>
> > <groupId>org.apache.ode</groupId>
> > <artifactId>ode-bpel-runtime</artifactId>
> > - <version>1.1-SNAPSHOT</version>
> > + <version>1.0-incubating</version>
> > </dependency>
> > <dependency>
> > <groupId>org.apache.ode</groupId>
> > <artifactId>ode-bpel-api</artifactId>
> > - <version>1.1-SNAPSHOT</version>
> > + <version>1.0-incubating</version>
> > </dependency>
> > <dependency>
> > <groupId>org.apache.ode </groupId>
> > <artifactId>ode-bpel-scheduler-quartz</artifactId>
> > - <version>1.1-SNAPSHOT</version>
> > + <version>1.0-incubating</version>
> > </dependency>
> > <dependency>
> > <groupId>org.apache.ode</groupId>
> > <artifactId>ode-utils</artifactId>
> > - <version>1.1-SNAPSHOT </version>
> > + <version>1.0-incubating</version>
> > </dependency>
> >
> > <!-- ODE Dependencies -->
> > @@ -213,4 +213,26 @@
> > </dependency>
> >
> > </dependencies>
> > +
> > + <build>
> > + <plugins>
> > + <plugin>
> > + <artifactId>maven-antrun-plugin</artifactId>
> > + <groupId> org.apache.maven.plugins</groupId>
> > +
> > + <executions>
> > + <execution>
> > + <phase>test-compile</phase>
> > + <goals><goal>run</goal></goals>
> > + <configuration>
> > + <tasks>
> > + <ant antfile="build.xml" target="test-db"
> > inheritRefs="true"/>
> > + </tasks>
> > + </configuration>
> > + </execution>
> > + </executions>
> > + </plugin>
> > + </plugins>
> > + </build>
> > +
> > </project>
> >
> > Modified:
> > incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
> > URL:
> > http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java?view=diff&rev=551409&r1=551408&r2=551409
> >
> > ==============================================================================
> > ---
> > incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
> > (original)
> > +++
> > incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
> > Wed Jun 27 17:03:00 2007
> > @@ -32,6 +32,7 @@
> > import java.util.concurrent.Executors ;
> > import java.util.concurrent.ExecutorService;
> > import java.io.File;
> > +import java.net.URL;
> >
> > import org.apache.commons.logging.Log;
> > import org.apache.commons.logging.LogFactory;
> > @@ -56,7 +57,12 @@
> >
> > public void init() throws ODEInitializationException {
> > _config = new OdeConfigProperties(new Properties(), "ode-sca");
> > - _workRoot = new File("ode-work");
> > +
> > + // Setting work root as the directory containing our database
> > (wherever in the classpath)
> > + URL dbLocation =
> > getClass().getClassLoader().getResource("jpadb");
> > + if (dbLocation == null)
> > + throw new ODEInitializationException("Couldn't find database
> > in the classpath");
> > + _workRoot = new File(dbLocation.getFile()).getParentFile();
> >
> > initTxMgr();
> > initPersistence();
> >
> >
> >
> > ---------------------------------------------------------------------
> > To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
> > For additional commands, e-mail: tuscany-commits-help@ws.apache.org
> >
> >
>
--
Luciano Resende
Apache Tuscany Committer
http://people.apache.org/~lresende
http://lresende.blogspot.com/
---------------------------------------------------------------------
To unsubscribe, e-mail: tuscany-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: tuscany-dev-help@ws.apache.org
Re: svn commit: r551409 - in /incubator/tuscany/java/sca/modules/implementation-bpel: lib/ lib/maven-artifact-ant-2.0.4-dep.jar pom.xml src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
Posted by ant elder <an...@apache.org>.
How come this ant jar needs to be checked into our svn and can't be got like
usual maven dependencies? (just trying to understand whats going on)
...ant
On 6/28/07, lresende@apache.org <lr...@apache.org> wrote:
>
> Author: lresende
> Date: Wed Jun 27 17:03:00 2007
> New Revision: 551409
>
> URL: http://svn.apache.org/viewvc?view=rev&rev=551409
> Log:
> TTUSCANY-1394 - Applying patch from Mathieu Riou
>
> Added:
> incubator/tuscany/java/sca/modules/implementation-bpel/lib/
> incubator/tuscany/java/sca/modules/implementation-bpel/lib/maven-
> artifact-ant-2.0.4-dep.jar (with props)
> Modified:
> incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
> incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
>
>
> Added: incubator/tuscany/java/sca/modules/implementation-bpel/lib/maven-
> artifact-ant-2.0.4-dep.jar
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/lib/maven-artifact-ant-2.0.4-dep.jar?view=auto&rev=551409
> ==============================================================================
>
> Binary file - no diff available.
>
> Propchange:
> incubator/tuscany/java/sca/modules/implementation-bpel/lib/maven-
> artifact-ant-2.0.4-dep.jar
> ------------------------------------------------------------------------------
>
> svn:mime-type = application/octet-stream
>
> Modified: incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml?view=diff&rev=551409&r1=551408&r2=551409
> ==============================================================================
>
> --- incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml
> (original)
> +++ incubator/tuscany/java/sca/modules/implementation-bpel/pom.xml Wed Jun
> 27 17:03:00 2007
> @@ -102,42 +102,42 @@
> <dependency>
> <groupId>org.apache.ode</groupId>
> <artifactId>ode-bpel-epr</artifactId>
> - <version>1.1-SNAPSHOT</version>
> + <version>1.0-incubating </version>
> </dependency>
> <dependency>
> <groupId>org.apache.ode</groupId>
> <artifactId>ode-bpel-dao</artifactId>
> - <version> 1.1-SNAPSHOT</version>
> + <version>1.0-incubating</version>
> </dependency>
> <dependency>
> <groupId>org.apache.ode</groupId>
> <artifactId>ode-bpel-dao</artifactId>
> - <version>1.1-SNAPSHOT</version>
> + <version>1.0-incubating</version>
> </dependency>
> <dependency>
> <groupId>org.apache.ode </groupId>
> <artifactId>ode-dao-jpa</artifactId>
> - <version>1.1-SNAPSHOT</version>
> + <version>1.0-incubating</version>
> </dependency>
> <dependency>
> <groupId>org.apache.ode</groupId>
> <artifactId>ode-bpel-runtime</artifactId>
> - <version>1.1-SNAPSHOT</version>
> + <version>1.0-incubating</version>
> </dependency>
> <dependency>
> <groupId>org.apache.ode</groupId>
> <artifactId>ode-bpel-api</artifactId>
> - <version>1.1-SNAPSHOT</version>
> + <version>1.0-incubating</version>
> </dependency>
> <dependency>
> <groupId>org.apache.ode </groupId>
> <artifactId>ode-bpel-scheduler-quartz</artifactId>
> - <version>1.1-SNAPSHOT</version>
> + <version>1.0-incubating</version>
> </dependency>
> <dependency>
> <groupId>org.apache.ode</groupId>
> <artifactId>ode-utils</artifactId>
> - <version>1.1-SNAPSHOT </version>
> + <version>1.0-incubating</version>
> </dependency>
>
> <!-- ODE Dependencies -->
> @@ -213,4 +213,26 @@
> </dependency>
>
> </dependencies>
> +
> + <build>
> + <plugins>
> + <plugin>
> + <artifactId>maven-antrun-plugin</artifactId>
> + <groupId> org.apache.maven.plugins</groupId>
> +
> + <executions>
> + <execution>
> + <phase>test-compile</phase>
> + <goals><goal>run</goal></goals>
> + <configuration>
> + <tasks>
> + <ant antfile="build.xml" target="test-db"
> inheritRefs="true"/>
> + </tasks>
> + </configuration>
> + </execution>
> + </executions>
> + </plugin>
> + </plugins>
> + </build>
> +
> </project>
>
> Modified:
> incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
> URL:
> http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java?view=diff&rev=551409&r1=551408&r2=551409
>
> ==============================================================================
> ---
> incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
> (original)
> +++
> incubator/tuscany/java/sca/modules/implementation-bpel/src/main/java/org/apache/tuscany/sca/implementation/bpel/ode/EmbeddedODEServer.java
> Wed Jun 27 17:03:00 2007
> @@ -32,6 +32,7 @@
> import java.util.concurrent.Executors ;
> import java.util.concurrent.ExecutorService;
> import java.io.File;
> +import java.net.URL;
>
> import org.apache.commons.logging.Log;
> import org.apache.commons.logging.LogFactory;
> @@ -56,7 +57,12 @@
>
> public void init() throws ODEInitializationException {
> _config = new OdeConfigProperties(new Properties(), "ode-sca");
> - _workRoot = new File("ode-work");
> +
> + // Setting work root as the directory containing our database
> (wherever in the classpath)
> + URL dbLocation =
> getClass().getClassLoader().getResource("jpadb");
> + if (dbLocation == null)
> + throw new ODEInitializationException("Couldn't find database
> in the classpath");
> + _workRoot = new File(dbLocation.getFile()).getParentFile();
>
> initTxMgr();
> initPersistence();
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: tuscany-commits-unsubscribe@ws.apache.org
> For additional commands, e-mail: tuscany-commits-help@ws.apache.org
>
>