7:36 p.m.
Author: jeff.yuchang
Date: 2009-10-22 13:36:20 -0400 (Thu, 22 Oct 2009)
New Revision: 199
Modified:
trunk/distribution/pom.xml
trunk/docs/docbook/pom.xml
trunk/pom.xml
trunk/runtime/engine-assembly/build.xml
trunk/runtime/engine-assembly/pom.xml
trunk/runtime/jbossesb-bpel/pom.xml
Log:
* RIFTSAW-61, comment out the bpel local repo, as I've already uploaded all jars into
jboss snapshots repo.
Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml 2009-10-21 09:26:13 UTC (rev 198)
+++ trunk/distribution/pom.xml 2009-10-22 17:36:20 UTC (rev 199)
@@ -172,7 +172,7 @@
<repositories>
- <repository>
+ <!--repository>
<id>bpel-local</id>
<name>jboss bpel localhost repository</name>
<url>file://${repoDir}/repo/m2-snapshot-repository</url>
@@ -182,7 +182,7 @@
<id>bpel</id>
<name>jboss bpel repository</name>
<url>https://svn.devel.redhat.com/repos/ODE/maven2/repo/m2-snapshot-rep...
- </repository>
+ </repository-->
<repository>
<id>jboss</id>
Modified: trunk/docs/docbook/pom.xml
===================================================================
--- trunk/docs/docbook/pom.xml 2009-10-21 09:26:13 UTC (rev 198)
+++ trunk/docs/docbook/pom.xml 2009-10-22 17:36:20 UTC (rev 199)
@@ -9,7 +9,13 @@
<version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RiftSaw::Docs</name>
-
+
+ <parent>
+ <groupId>org.jboss.soa</groupId>
+ <artifactId>bpel</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
<profiles>
<profile>
<id>docs</id>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-10-21 09:26:13 UTC (rev 198)
+++ trunk/pom.xml 2009-10-22 17:36:20 UTC (rev 199)
@@ -179,7 +179,7 @@
</dependencyManagement>
<distributionManagement>
- <repository>
+ <!--repository>
<id>bpel-repo</id>
<name>BPEL Maven Central Repository</name>
<url>scp://localhost/web/repo/m2-ibiblio-rsync-repository</url>
@@ -188,8 +188,17 @@
<id>bpel-snapshots</id>
<name>BPEL Development Repository</name>
<url>scp://localhost/web/repo/m2-snapshot-repository</url>
+ </snapshotRepository-->
+ <repository>
+ <id>jboss</id>
+ <name>JBoss Maven Repository</name>
+ <url>file://${jboss.maven.repository}</url>
+ </repository>
+ <snapshotRepository>
+ <id>jboss-snapshots</id>
+ <name>JBoss Snapshot Repository</name>
+ <url>dav:https://snapshots.jboss.org/maven2</url>
</snapshotRepository>
-
</distributionManagement>
<build>
@@ -264,7 +273,7 @@
<repositories>
- <repository>
+ <!--repository>
<id>bpel-local</id>
<name>jboss bpel localhost repository</name>
<url>file://${repoDir}/repo/m2-snapshot-repository</url>
@@ -274,7 +283,7 @@
<id>bpel</id>
<name>jboss bpel repository</name>
<url>https://svn.devel.redhat.com/repos/ODE/maven2/repo/m2-snapshot-rep...
- </repository>
+ </repository-->
<repository>
<id>jboss</id>
Modified: trunk/runtime/engine-assembly/build.xml
===================================================================
--- trunk/runtime/engine-assembly/build.xml 2009-10-21 09:26:13 UTC (rev 198)
+++ trunk/runtime/engine-assembly/build.xml 2009-10-22 17:36:20 UTC (rev 199)
@@ -1,11 +1,11 @@
<project name="engine-assembly" default="package-bpel"
basedir=".">
-
- <property environment="env" />
+
<property name="riftsaw.engine.version" value="2.0-SNAPSHOT"
/>
<target name="unzip-ode">
<mkdir dir="${basedir}/target/ode-distro"/>
- <unzip dest="${basedir}/target/ode-distro"
src="${env.repoDir}/repo/m2-snapshot-repository/org/jboss/soa/bpel/jboss-riftsaw-war/${riftsaw.engine.version}/jboss-riftsaw-war-${riftsaw.engine.version}.zip"/>
+ <echo>${local.repo}</echo>
+ <unzip dest="${basedir}/target/ode-distro"
src="${local.repo}/org/jboss/soa/bpel/jboss-riftsaw-war/${riftsaw.engine.version}/jboss-riftsaw-war-${riftsaw.engine.version}.zip"/>
</target>
<target name="create-war" depends="unzip-ode">
Modified: trunk/runtime/engine-assembly/pom.xml
===================================================================
--- trunk/runtime/engine-assembly/pom.xml 2009-10-21 09:26:13 UTC (rev 198)
+++ trunk/runtime/engine-assembly/pom.xml 2009-10-22 17:36:20 UTC (rev 199)
@@ -24,6 +24,12 @@
<artifactId>engine</artifactId>
<version>${version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>jboss-riftsaw-war</artifactId>
+ <version>${version}</version>
+ <type>zip</type>
+ </dependency>
</dependencies>
<build>
@@ -49,6 +55,7 @@
<property name="test_classpath"
refid="maven.test.classpath" />
<property name="plugin_classpath"
refid="maven.plugin.classpath" />
<property name="project.version"
value="${project.version}" />
+ <property name="local.repo"
value="${settings.localRepository}" />
<property name="dependency.bpel.deployer"
value="${maven.dependency.org.jboss.soa.bpel.runtime.deployer.jar.path}" />
<property name="dependency.bpel.engine"
Modified: trunk/runtime/jbossesb-bpel/pom.xml
===================================================================
--- trunk/runtime/jbossesb-bpel/pom.xml 2009-10-21 09:26:13 UTC (rev 198)
+++ trunk/runtime/jbossesb-bpel/pom.xml 2009-10-22 17:36:20 UTC (rev 199)
@@ -1,18 +1,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.soa.bpel.runtime</groupId>
+ <groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>jbossesb-bpel</artifactId>
<packaging>jar</packaging>
<version>2.0-SNAPSHOT</version>
- <name>RiftSaw::Runtime::JBossESB-BPEL</name>
+ <name>RiftSaw::Runtime::JBossESB-BPEL</name>
<url>http://www.jboss.org</url>
-
- <parent>
- <groupId>org.jboss.soa.bpel</groupId>
- <artifactId>runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </parent>
+
+ <parent>
+ <groupId>org.jboss.soa.bpel</groupId>
+ <artifactId>runtime</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
<dependencies>
<dependency>
@@ -21,12 +21,12 @@
<version>2.0-SNAPSHOT</version>
</dependency>
<dependency>
- <groupId>org.jboss.soa.esb</groupId>
+ <groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>jbossesb-rosetta</artifactId>
<version>4.5.GA</version>
</dependency>
<dependency>
- <groupId>org.jboss.soa.esb</groupId>
+ <groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>jbossts-common</artifactId>
<version>4.5.GA</version>
<scope>test</scope>