Author: mszefler
Date: Wed Jan 24 18:08:24 2007
New Revision: 499641
URL: http://svn.apache.org/viewvc?view=rev&rev=499641
Log:
Put an end to the utopian experiment of using the touchy feely
you're ok, we're ok, world-wide-resource repository.
New philosophy: Germanic, all dependencies are specified PRECISELY, don't use
foreign repositories.
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
incubator/ode/trunk/bpel-runtime/pom.xml
incubator/ode/trunk/dao-jpa-ojpa-derby/pom.xml
incubator/ode/trunk/pom.xml
Modified:
incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java?view=diff&rev=499641&r1=499640&r2=499641
==============================================================================
--- incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
(original)
+++ incubator/ode/trunk/axis2/src/main/java/org/apache/ode/axis2/ODEServer.java
Wed Jan 24 18:08:24 2007
@@ -478,7 +478,7 @@
_executorService = Executors.newCachedThreadPool();
_scheduler = new QuartzSchedulerImpl();
- _scheduler.setBpelServer(_server);
+ _scheduler.setJobProcessor(_server);
_scheduler.setExecutorService(_executorService, 20);
_scheduler.setTransactionManager(_txMgr);
_scheduler.setDataSource(_datasource);
Modified: incubator/ode/trunk/bpel-runtime/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/pom.xml?view=diff&rev=499641&r1=499640&r2=499641
==============================================================================
--- incubator/ode/trunk/bpel-runtime/pom.xml (original)
+++ incubator/ode/trunk/bpel-runtime/pom.xml Wed Jan 24 18:08:24 2007
@@ -199,6 +199,8 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+
<executions>
<execution>
<phase>test-compile</phase>
Modified: incubator/ode/trunk/dao-jpa-ojpa-derby/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/dao-jpa-ojpa-derby/pom.xml?view=diff&rev=499641&r1=499640&r2=499641
==============================================================================
--- incubator/ode/trunk/dao-jpa-ojpa-derby/pom.xml (original)
+++ incubator/ode/trunk/dao-jpa-ojpa-derby/pom.xml Wed Jan 24 18:08:24 2007
@@ -80,6 +80,7 @@
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
Modified: incubator/ode/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/pom.xml?view=diff&rev=499641&r1=499640&r2=499641
==============================================================================
--- incubator/ode/trunk/pom.xml (original)
+++ incubator/ode/trunk/pom.xml Wed Jan 24 18:08:24 2007
@@ -187,10 +187,52 @@
<!--version>2.1-SNAPSHOT</version-->
<version>2.1</version>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ <version>2.0-beta-5</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.2</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ </plugin>
+
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.0</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>javacc-maven-plugin</artifactId>
+ <version>2.1</version>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.1</version>
<configuration>
<source>1.5</source>
<target>1.5</target>
@@ -272,6 +314,7 @@
<updatePolicy>never</updatePolicy>
</snapshots>
</repository>
+<!-- Rely only on Intalio repository, prevents maven madness.
<repository>
<id>central-maven</id>
<name>Maven Repository Switchboard</name>
@@ -282,7 +325,6 @@
</snapshots>
</repository>
-<!-- Rely only on Intalio repository, prevents maven madness.
<repository>
<id>apache-incubator</id>
@@ -338,13 +380,13 @@
<name>Intalio Maven2 repository</name>
<url>http://pxe.intalio.org/public/maven2</url>
</pluginRepository>
+<!-- Safe sex....
<pluginRepository>
<id>central-maven</id>
<name>Maven Repository Switchboard</name>
<url>http://repo1.maven.org/maven2</url>
</pluginRepository>
-<!-- Safe sex....
<pluginRepository>
<id>codehaus</id>
