riftsaw SVN: r443 - in branches/ODE/ODE-2.0-maven/axis2-war/src/main: assembly and 1 other directory.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-01-08 03:45:25 -0500 (Fri, 08 Jan 2010)
New Revision: 443
Added:
branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/
branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/bin.xml
Log:
* forgot bin.xml files in my last commit.* forgot bin.xml files in my last commit.* forgot bin.xml files in my last commit.* forgot bin.xml files in my last commit.* forgot bin.xml files in my last commit.* forgot bin.xml files in my last commit.* forgot bin.xml files in my last commit.* forgot bin.xml files in my last commit.
Added: branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/bin.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/bin.xml (rev 0)
+++ branches/ODE/ODE-2.0-maven/axis2-war/src/main/assembly/bin.xml 2010-01-08 08:45:25 UTC (rev 443)
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+<assembly>
+ <!-- id typically identifies the "type" (src vs bin etc) of the assembly -->
+ <id></id>
+ <includeBaseDirectory>false</includeBaseDirectory>
+ <formats>
+ <format>war</format>
+ </formats>
+
+ <fileSets>
+
+ <fileSet>
+ <directory>src/main/webapp</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../dao-jpa-db/target/derby</directory>
+ <outputDirectory>/WEB-INF</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../dao-hibernate-db/target/derby</directory>
+ <outputDirectory>/WEB-INF</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../axis2/src/main/wsdl</directory>
+ <outputDirectory>/WEB-INF</outputDirectory>
+ </fileSet>
+
+ <fileSet>
+ <directory>${basedir}/../bpel-schemas/src/main/xsd</directory>
+ <outputDirectory>/WEB-INF</outputDirectory>
+ <includes>
+ <include>pmapi.xsd</include>
+ </includes>
+ </fileSet>
+
+ </fileSets>
+
+ <dependencySets>
+
+ <dependencySet>
+ <outputDirectory>/WEB-INF/lib</outputDirectory>
+ <includes>
+ <include>org.apache.ode:ode-bpel-api</include>
+ <include>org.apache.ode:ode-bpel-compiler</include>
+ <include>org.apache.ode:ode-bpel-connector</include>
+ <include>org.apache.ode:ode-bpel-dao</include>
+ <include>org.apache.ode:ode-axis2</include>
+ <include>org.apache.ode:ode-il-common</include>
+ <include>org.apache.ode:ode-runtimes</include>
+ <include>org.apache.ode:ode-engine</include>
+ <include>org.apache.ode:ode-scheduler-simple</include>
+ <include>org.apache.ode:ode-bpel-schemas</include>
+ <include>org.apache.ode:ode-bpel-store</include>
+ <include>org.apache.ode:ode-dao-hibernate</include>
+ <include>org.apache.ode:ode-jacob</include>
+ <include>org.apache.ode:ode-jca-ra</include>
+ <include>org.apache.ode:ode-jca-server</include>
+ <include>org.apache.ode:ode-utils</include>
+ <include>org.apache.ode:ode-dao-jpa</include>
+ <include>annogen:annogen</include>
+ <include>antlr:antlr</include>
+ <include>javax.activation:activation</include>
+ <include>org.apache.axis2:axis2-adb</include>
+ <include>org.apache.axis2:axis2-adb-codegen</include>
+ <include>org.apache.axis2:axis2-codegen</include>
+ <include>org.apache.axis2:axis2-corba</include>
+ <include>org.apache.axis2:axis2-fastinfoset</include>
+ <include>org.apache.axis2:axis2-java2wsdl</include>
+ <include>org.apache.axis2:axis2-jaxbri</include>
+ <include>org.apache.axis2:axis2-jaxws</include>
+ <include>org.apache.axis2:axis2-jaxws-api</include>
+ <include>org.apache.axis2:axis2-jibx</include>
+ <include>org.apache.axis2:axis2-json</include>
+ <include>org.apache.axis2:axis2-jws-api</include>
+ <include>org.apache.axis2:axis2-kernel</include>
+ <include>org.apache.axis2:axis2-metadata</include>
+ <include>org.apache.axis2:axis2-mtompolicy</include>
+ <include>org.apache.axis2:axis2-saaj</include>
+ <include>org.apache.axis2:axis2-saaj-api</include>
+ <include>org.apache.axis2:axis2-spring</include>
+ <include>org.apache.axis2:axis2-xmlbeans</include>
+ <include>org.apache.ws.commons.axiom:axiom-api</include>
+ <include>org.apache.ws.commons.axiom:axiom-impl</include>
+ <include>org.apache.ws.commons.axiom:axiom-dom</include>
+ <include>backport-util-concurrent:backport-util-concurrent</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-collections:commons-collections</include>
+ <include>commons-dbcp:commons-dbcp</include>
+ <include>commons-lang:commons-lang</include>
+ <include>commons-pool:commons-pool</include>
+ <include>commons-io:commons-io</include>
+ <include>commons-fileupload:commons-fileupload</include>
+ <include>org.apache.derby:derby</include>
+ <include>org.apache.derby:derbytools</include>
+ <include>org.apache.geronimo.specs:geronimo-ejb_2.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-jta_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-activation_1.1_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-stax-api_1.0_spec</include>
+ <include>org.apache.geronimo.specs:geronimo-javamail_1.4_spec</include>
+ <include>geronimo-spec:geronimo-spec-jms</include>
+ <include>org.apache.geronimo.modules:geronimo-kernel</include>
+ <include>org.apache.geronimo.components:geronimo-transaction</include>
+ <include>org.apache.geronimo.components:geronimo-connector</include>
+ <include>org.apache.woden:woden-api</include>
+ <include>org.apache.woden:woden-impl-dom</include>
+ <include>woodstox:wstx-asl</include>
+ <include>org.apache.neethi:neethi</include>
+ <include>org.apache.ws.commons.schema:XmlSchema</include>
+ <include>xerces:xercesImpl</include>
+ <include>org.apache.rampart:rampart-core</include>
+ <include>org.apache.rampart:rampart-policy</include>
+ <include>org.apache.rampart:rampart-trust</include>
+ <include>org.apache.ws.security:wss4j</include>
+ <include>org.apache.santuario:xmlsec</include>
+ <include>org.apache.axis2:mex</include>
+ <include>org.opensaml:opensaml</include>
+ <include>bouncycastle:bcprov-jdk15</include>
+ <include>org.jibx:jibx-run</include>
+ <include>org.jibx:jibx-bind</include>
+ <include>org.codehaus.jettison:jettison</include>
+ <include>jaxen:jaxen</include>
+ <include>log4j:log4j</include>
+ <include>org.apache.openjpa:openjpa</include>
+ <include>javax.persistence:persistence-api</include>
+ <include>net.sourceforge.serp:serp</include>
+ <include>net.sf.saxon:saxon</include>
+ <include>net.sf.saxon:saxon-xpath</include>
+ <include>net.sf.saxon:saxon-dom</include>
+ <include>net.sf.saxon:saxon-xqj</include>
+ <include>wsdl4j:wsdl4j</include>
+ <include>tranql:tranql-connector</include>
+ <include>org.apache.ode:xalan</include>
+ <include>org.apache.xmlbeans:xmlbeans</include>
+ <include>org.apache.httpcomponents:httpcore</include>
+ <include>org.apache.httpcomponents:httpcore-nio</include>
+ <include>javax.xml.bind:jaxb-api</include>
+ <include>com.sun.xml.bind:jaxb-impl</include>
+ <include>com.sun.xml.bind:jaxb-xjc</include>
+ <include>xml-resolver:xml-resolver</include>
+ <include>xml-apis:xml-apis</include>
+ <include>javax.mail:mail</include>
+ </includes>
+ </dependencySet>
+
+ <dependencySet>
+ <outputDirectory>/WEB-INF/modules</outputDirectory>
+ <includes>
+ <include>org.apache.rampart:rampart:mar</include>
+ <include>org.apache.rampart:rahas:mar</include>
+ <include>org.apache.axis2:addressing:mar</include>
+ <include>org.apache.axis2:mex:mar</include>
+ </includes>
+ </dependencySet>
+
+ </dependencySets>
+
+</assembly>
14 years, 11 months
riftsaw SVN: r442 - in branches/ODE/ODE-2.0-maven: axis2-war and 1 other directory.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-01-08 03:29:12 -0500 (Fri, 08 Jan 2010)
New Revision: 442
Added:
branches/ODE/ODE-2.0-maven/axis2-war/pom.xml
Modified:
branches/ODE/ODE-2.0-maven/pom.xml
Log:
* add pom for axis2-war, testing part is not ported yet.
Added: branches/ODE/ODE-2.0-maven/axis2-war/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/axis2-war/pom.xml (rev 0)
+++ branches/ODE/ODE-2.0-maven/axis2-war/pom.xml 2010-01-08 08:29:12 UTC (rev 442)
@@ -0,0 +1,238 @@
+<?xml version="1.0"?>
+<!--
+ ~ Licensed to the Apache Software Foundation (ASF) under one
+ ~ or more contributor license agreements. See the NOTICE file
+ ~ distributed with this work for additional information
+ ~ regarding copyright ownership. The ASF licenses this file
+ ~ to you under the Apache License, Version 2.0 (the
+ ~ "License"); you may not use this file except in compliance
+ ~ with the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing,
+ ~ software distributed under the License is distributed on an
+ ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ ~ KIND, either express or implied. See the License for the
+ ~ specific language governing permissions and limitations
+ ~ under the License.
+ -->
+
+<project>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-axis2-war</artifactId>
+ <name>ODE :: Axis2 Based Web Application</name>
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+
+ <properties>
+ <rampart.version>1.4</rampart.version>
+ <mex.version>1.41</mex.version>
+ <axis2.version>1.4.1</axis2.version>
+ <jibx.version>1.1.5</jibx.version>
+ <tranql.version>1.1</tranql.version>
+ <opensaml.version>1.1</opensaml.version>
+ <bouncycastle.version>140</bouncycastle.version>
+ <geronimo-spec-jms.version>1.1-rc4</geronimo-spec-jms.version>
+ </properties>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-compiler</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-connector</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-dao</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-il-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-engine</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-scheduler-simple</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-store</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-bpel-schemas</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-dao-jpa</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
+ <artifactId>ode-axis2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-corba</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-fastinfoset</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxbri</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws-api</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-json</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jws-api</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-metadata</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-spring</artifactId>
+ <version>${axis2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jibx</groupId>
+ <artifactId>jibx-run</artifactId>
+ <version>${jibx.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>tranql</groupId>
+ <artifactId>tranql-connector</artifactId>
+ <version>${tranql.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.opensaml</groupId>
+ <artifactId>opensaml</artifactId>
+ <version>${opensaml.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>bouncycastle</groupId>
+ <artifactId>bcprov-jdk15</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>geronimo-spec</groupId>
+ <artifactId>geronimo-spec-jms</artifactId>
+ <version>${geronimo-spec-jms.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rampart</artifactId>
+ <type>mar</type>
+ <version>${rampart.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.rampart</groupId>
+ <artifactId>rahas</artifactId>
+ <type>mar</type>
+ <version>${rampart.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>addressing</artifactId>
+ <type>mar</type>
+ <version>${rampart.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>mex</artifactId>
+ <type>mar</type>
+ <version>${mex.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>war-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>ode-axis2-war-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
Modified: branches/ODE/ODE-2.0-maven/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/pom.xml 2010-01-07 06:44:26 UTC (rev 441)
+++ branches/ODE/ODE-2.0-maven/pom.xml 2010-01-08 08:29:12 UTC (rev 442)
@@ -128,17 +128,10 @@
<module>extensions</module>
<module>axis2</module>
<module>jbi</module>
+ <module>axis2-war</module>
</modules>
<build>
- <defaultGoal>package</defaultGoal>
- <extensions>
- <extension>
- <groupId>org.apache.maven.wagon</groupId>
- <artifactId>wagon-ssh-external</artifactId>
- <version>1.0-alpha-6</version>
- </extension>
- </extensions>
<pluginManagement>
<plugins>
<plugin>
@@ -398,6 +391,11 @@
</dependency>
<dependency>
<groupId>org.apache.ode</groupId>
+ <artifactId>ode-axis2</artifactId>
+ <version>${ode.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.ode</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
</dependency>
@@ -622,22 +620,22 @@
<dependency>
<groupId>woodstox</groupId>
<artifactId>wstx-asl</artifactId>
- <version>${woodstox4j.version}</version>
+ <version>${woodstox.version}</version>
</dependency>
<dependency>
<groupId>javax.mail</groupId>
<artifactId>mail</artifactId>
<version>${javax.mail.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
+ <dependency>
+ <groupId>org.apache.openjpa</groupId>
<artifactId>openjpa</artifactId>
- <version>${openjpa.version}</version>
+ <version>${openjpa.version}</version>
</dependency>
- <dependency>
- <groupId>net.sourceforge.serp</groupId>
+ <dependency>
+ <groupId>net.sourceforge.serp</groupId>
<artifactId>serp</artifactId>
- <version>${serp.version}</version>
+ <version>${serp.version}</version>
</dependency>
<dependency>
<groupId>dom4j</groupId>
@@ -728,7 +726,6 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
<version>${xerces.version}</version>
- <scope>provided</scope>
</dependency>
<dependency>
<groupId>xerces</groupId>
14 years, 11 months
riftsaw SVN: r441 - in branches/ODE/ODE-2.0-maven: bpel-store and 4 other directories.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-01-07 01:44:26 -0500 (Thu, 07 Jan 2010)
New Revision: 441
Modified:
branches/ODE/ODE-2.0-maven/bpel-store/pom.xml
branches/ODE/ODE-2.0-maven/dao-hibernate-db/build.xml
branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml
branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml
branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml
branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml
branches/ODE/ODE-2.0-maven/jbi/pom.xml
branches/ODE/ODE-2.0-maven/pom.xml
Log:
* using maven antrun plugin to invoke the openjpa enhance.
* add derby db built script. (with sql task, maven output is not running well, so comment it for now.)
Modified: branches/ODE/ODE-2.0-maven/bpel-store/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/bpel-store/pom.xml 2010-01-06 14:14:58 UTC (rev 440)
+++ branches/ODE/ODE-2.0-maven/bpel-store/pom.xml 2010-01-07 06:44:26 UTC (rev 441)
@@ -180,30 +180,37 @@
<build>
<plugins>
- <!--FIXME it can't be run along with dao-jpa module -->
- <!--plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
+ <plugin>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>enhancer</id>
+ <id>openjpa-enhancer</id>
<phase>process-classes</phase>
<goals>
- <goal>enhance</goal>
+ <goal>run</goal>
</goals>
+ <configuration>
+ <tasks>
+ <property name="maven.runtime.classpath" refid="maven.test.classpath"/>
+ <path id="classpath">
+ <pathelement path="${maven.runtime.classpath}"/>
+ </path>
+ <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="classpath"/>
+ <openjpac>
+ <fileset dir="${basedir}/src/main">
+ <include name="**/*.java" />
+ </fileset>
+ <classpath>
+ <pathelement location="${basedir}/target/classes"/>
+ <pathelement path="${maven.runtime.classpath}"/>
+ </classpath>
+ </openjpac>
+ </tasks>
+ </configuration>
</execution>
</executions>
+ </plugin>
- <dependencies>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${wsdl4j.version}</version>
- </dependency>
- </dependencies>
-
- </plugin-->
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xdoclet-maven-plugin</artifactId>
Modified: branches/ODE/ODE-2.0-maven/dao-hibernate-db/build.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/dao-hibernate-db/build.xml 2010-01-06 14:14:58 UTC (rev 440)
+++ branches/ODE/ODE-2.0-maven/dao-hibernate-db/build.xml 2010-01-07 06:44:26 UTC (rev 441)
@@ -36,6 +36,9 @@
<mkdir dir="target"/>
<mkdir dir="${db.scripts.dir}" />
+ <!-- Derby -->
+ <create-ddl db="derby"/>
+
<!-- MySQL -->
<create-ddl db="mysql"/>
@@ -56,6 +59,24 @@
</target>
+ <target name="create-derby-db">
+ <property name="dblocation" value="${basedir}/target/derby/hibdb" />
+ <sql
+ driver="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:${dblocation};create=true"
+ userid="sa"
+ password=""
+ autocommit="yes"
+ >
+ <transaction src="${basedir}/target/derby.sql"/>
+ <classpath>
+ <path refid="classpath"/>
+ </classpath>
+ </sql>
+ <zip destfile="${basedir}/target/ode-dao-hibernate-db-${ode.version}.zip" basedir="${basedir}/target/derby/" />
+
+ </target>
+
<!--
============================================
Macro defs, no need to change anything below
@@ -73,7 +94,7 @@
properties="${sql.dir}/ode.(a){db}.properties"
quiet="yes"
text="yes"
- drop="no"
+ create="yes"
delimiter=";"
output="${db.scripts.dir}/partial.(a){db}.sql">
<fileset dir="${dao-hibernate.classes}/">
Modified: branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml 2010-01-06 14:14:58 UTC (rev 440)
+++ branches/ODE/ODE-2.0-maven/dao-hibernate-db/pom.xml 2010-01-07 06:44:26 UTC (rev 441)
@@ -52,6 +52,14 @@
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -67,7 +75,9 @@
<configuration>
<tasks>
<property name="maven.runtime.classpath" refid="maven.compile.classpath"/>
+ <property name="ode.version" value="${ode.version}" />
<ant antfile="build.xml" target="create-schema" inheritRefs="true"/>
+ <!--ant antfile="build.xml" target="create-derby-db" /-->
</tasks>
</configuration>
<goals>
Modified: branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml 2010-01-06 14:14:58 UTC (rev 440)
+++ branches/ODE/ODE-2.0-maven/dao-jpa/pom.xml 2010-01-07 06:44:26 UTC (rev 441)
@@ -88,21 +88,37 @@
<build>
<plugins>
<plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
+ <artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
- <id>enhancer</id>
+ <id>openjpa-enhancer</id>
<phase>process-classes</phase>
<goals>
- <goal>enhance</goal>
+ <goal>run</goal>
</goals>
+ <configuration>
+ <tasks>
+ <property name="maven.runtime.classpath" refid="maven.compile.classpath"/>
+ <path id="classpath">
+ <pathelement path="${maven.runtime.classpath}"/>
+ </path>
+ <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="classpath"/>
+ <openjpac>
+ <fileset dir="${basedir}/src/main">
+ <include name="**/*.java" />
+ </fileset>
+ <classpath>
+ <pathelement location="${basedir}/target/classes"/>
+ <pathelement path="${maven.runtime.classpath}"/>
+ </classpath>
+ </openjpac>
+ </tasks>
+ </configuration>
</execution>
</executions>
</plugin>
-
</plugins>
- </build>
+ </build>
</project>
Modified: branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml 2010-01-06 14:14:58 UTC (rev 440)
+++ branches/ODE/ODE-2.0-maven/dao-jpa-db/build.xml 2010-01-07 06:44:26 UTC (rev 441)
@@ -48,6 +48,24 @@
</target>
+ <target name="create-derby-db">
+ <property name="dblocation" value="${basedir}/target/derby/jpadb" />
+ <sql
+ driver="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:${dblocation};create=true"
+ userid="sa"
+ password=""
+ autocommit="yes"
+ >
+ <transaction src="${basedir}/target/derby.sql"/>
+ <classpath>
+ <path refid="classpath"/>
+ </classpath>
+ </sql>
+ <zip destfile="${basedir}/target/ode-dao-jpa-db-${ode.version}.zip" basedir="${basedir}/target/derby/" />
+
+ </target>
+
<!--
============================================
Macro defs, no need to change anything below
Modified: branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml 2010-01-06 14:14:58 UTC (rev 440)
+++ branches/ODE/ODE-2.0-maven/dao-jpa-db/pom.xml 2010-01-07 06:44:26 UTC (rev 441)
@@ -110,6 +110,14 @@
<dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derby</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -151,9 +159,9 @@
<configuration>
<tasks>
<property name="maven.runtime.classpath" refid="maven.compile.classpath"/>
- <ant antfile="build.xml"
- target="create-schema">
- </ant>
+ <property name="ode.version" value="${ode.version}"/>
+ <ant antfile="build.xml" target="create-schema" />
+ <!--ant antfile="build.xml" target="create-derby-db" /-->
</tasks>
</configuration>
</execution>
Modified: branches/ODE/ODE-2.0-maven/jbi/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/jbi/pom.xml 2010-01-06 14:14:58 UTC (rev 440)
+++ branches/ODE/ODE-2.0-maven/jbi/pom.xml 2010-01-07 06:44:26 UTC (rev 441)
@@ -204,26 +204,26 @@
<skipTests>true</skipTests>
</configuration>
</plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>jbi-package</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <finalName>ode-jbi-${project.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>src/main/assembly/bin.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </execution>
- </executions>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jbi-package</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <finalName>ode-jbi-${project.version}</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </execution>
+ </executions>
</plugin>
</plugins>
</build>
Modified: branches/ODE/ODE-2.0-maven/pom.xml
===================================================================
--- branches/ODE/ODE-2.0-maven/pom.xml 2010-01-06 14:14:58 UTC (rev 440)
+++ branches/ODE/ODE-2.0-maven/pom.xml 2010-01-07 06:44:26 UTC (rev 441)
@@ -182,20 +182,6 @@
</dependencies>
</plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>openjpa-maven-plugin</artifactId>
- <version>1.0</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.openjpa</groupId>
- <artifactId>openjpa</artifactId>
- <version>1.1.0</version>
- </dependency>
- </dependencies>
-
- </plugin>
-
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>xmlbeans-maven-plugin</artifactId>
@@ -782,6 +768,11 @@
<version>${derby.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.derby</groupId>
+ <artifactId>derbytools</artifactId>
+ <version>${derby.version}</version>
+ </dependency>
+ <dependency>
<groupId>hsqldb</groupId>
<artifactId>hsqldb</artifactId>
<version>${hsqldb.version}</version>
14 years, 11 months
riftsaw SVN: r440 - in trunk/samples/quickstart: hello_world_header_wsdl/bpelContent and 1 other directory.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-01-06 09:14:58 -0500 (Wed, 06 Jan 2010)
New Revision: 440
Modified:
trunk/samples/quickstart/hello_world_header_ode/bpelContent/HelloWorld.bpel
trunk/samples/quickstart/hello_world_header_ode/bpelContent/HelloWorld.wsdl
trunk/samples/quickstart/hello_world_header_ode/bpelContent/bpel-deploy.xml
trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/HelloWorld.bpel
trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/HelloWorld.wsdl
trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/bpel-deploy.xml
Log:
RIFTSAW-142 - needed to update the port and service names, so they did not conflict with the hello_world sample.
Modified: trunk/samples/quickstart/hello_world_header_ode/bpelContent/HelloWorld.bpel
===================================================================
--- trunk/samples/quickstart/hello_world_header_ode/bpelContent/HelloWorld.bpel 2010-01-06 12:00:55 UTC (rev 439)
+++ trunk/samples/quickstart/hello_world_header_ode/bpelContent/HelloWorld.bpel 2010-01-06 14:14:58 UTC (rev 440)
@@ -45,7 +45,7 @@
<receive
name="start"
partnerLink="helloPartnerLink"
- portType="intf:HelloPortType"
+ portType="intf:HelloHeaderODEPortType"
operation="hello"
variable="myVar"
createInstance="yes"/>
@@ -66,7 +66,7 @@
</assign>
<reply name="end"
partnerLink="helloPartnerLink"
- portType="intf:HelloPortType"
+ portType="intf:HelloHeaderODEPortType"
operation="hello"
variable="myVar"/>
</sequence>
Modified: trunk/samples/quickstart/hello_world_header_ode/bpelContent/HelloWorld.wsdl
===================================================================
--- trunk/samples/quickstart/hello_world_header_ode/bpelContent/HelloWorld.wsdl 2010-01-06 12:00:55 UTC (rev 439)
+++ trunk/samples/quickstart/hello_world_header_ode/bpelContent/HelloWorld.wsdl 2010-01-06 14:14:58 UTC (rev 440)
@@ -30,14 +30,14 @@
<wsdl:part name="TestPart" type="xsd:string"/>
</wsdl:message>
- <wsdl:portType name="HelloPortType">
+ <wsdl:portType name="HelloHeaderODEPortType">
<wsdl:operation name="hello">
<wsdl:input message="tns:HelloMessage" name="TestIn"/>
<wsdl:output message="tns:HelloMessage" name="TestOut"/>
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
+ <wsdl:binding name="HelloHeaderODESoapBinding" type="tns:HelloHeaderODEPortType">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="hello">
<soap:operation soapAction="" style="rpc"/>
@@ -53,15 +53,15 @@
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
- <wsdl:service name="HelloService">
- <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
+ <wsdl:service name="HelloHeaderODEService">
+ <wsdl:port name="HelloHeaderODEPort" binding="tns:HelloHeaderODESoapBinding">
<soap:address location="http://localhost:8080/Quickstart_bpel_hello_world_header_odeWS"/>
</wsdl:port>
</wsdl:service>
<plnk:partnerLinkType name="HelloPartnerLinkType">
- <plnk:role name="me" portType="tns:HelloPortType"/>
- <plnk:role name="you" portType="tns:HelloPortType"/>
+ <plnk:role name="me" portType="tns:HelloHeaderODEPortType"/>
+ <plnk:role name="you" portType="tns:HelloHeaderODEPortType"/>
</plnk:partnerLinkType>
</wsdl:definitions>
Modified: trunk/samples/quickstart/hello_world_header_ode/bpelContent/bpel-deploy.xml
===================================================================
--- trunk/samples/quickstart/hello_world_header_ode/bpelContent/bpel-deploy.xml 2010-01-06 12:00:55 UTC (rev 439)
+++ trunk/samples/quickstart/hello_world_header_ode/bpelContent/bpel-deploy.xml 2010-01-06 14:14:58 UTC (rev 440)
@@ -24,7 +24,7 @@
<process name="bpl:HelloWorldHeaderODE">
<active>true</active>
<provide partnerLink="helloPartnerLink">
- <service name="intf:HelloService" port="HelloPort"/>
+ <service name="intf:HelloHeaderODEService" port="HelloHeaderODEPort"/>
</provide>
</process>
</deploy>
Modified: trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/HelloWorld.bpel
===================================================================
--- trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/HelloWorld.bpel 2010-01-06 12:00:55 UTC (rev 439)
+++ trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/HelloWorld.bpel 2010-01-06 14:14:58 UTC (rev 440)
@@ -45,7 +45,7 @@
<receive
name="start"
partnerLink="helloPartnerLink"
- portType="intf:HelloPortType"
+ portType="intf:HelloHeaderWSPortType"
operation="hello"
variable="myVar"
createInstance="yes"/>
@@ -66,7 +66,7 @@
</assign>
<reply name="end"
partnerLink="helloPartnerLink"
- portType="intf:HelloPortType"
+ portType="intf:HelloHeaderWSPortType"
operation="hello"
variable="myVar"/>
</sequence>
Modified: trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/HelloWorld.wsdl
===================================================================
--- trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/HelloWorld.wsdl 2010-01-06 12:00:55 UTC (rev 439)
+++ trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/HelloWorld.wsdl 2010-01-06 14:14:58 UTC (rev 440)
@@ -45,7 +45,7 @@
</wsdl:operation>
</wsdl:portType>
- <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType">
+ <wsdl:binding name="HelloHeaderWSSoapBinding" type="tns:HelloHeaderWSPortType">
<soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
<wsdl:operation name="hello">
<soap:operation soapAction="" style="rpc"/>
@@ -65,15 +65,15 @@
</wsdl:output>
</wsdl:operation>
</wsdl:binding>
- <wsdl:service name="HelloService">
- <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
+ <wsdl:service name="HelloHeaderWSService">
+ <wsdl:port name="HelloHeaderWSPort" binding="tns:HelloHeaderWSSoapBinding">
<soap:address location="http://localhost:8080/Quickstart_bpel_hello_world_header_wsdlWS"/>
</wsdl:port>
</wsdl:service>
<plnk:partnerLinkType name="HelloPartnerLinkType">
- <plnk:role name="me" portType="tns:HelloPortType"/>
- <plnk:role name="you" portType="tns:HelloPortType"/>
+ <plnk:role name="me" portType="tns:HelloHeaderWSPortType"/>
+ <plnk:role name="you" portType="tns:HelloHeaderWSPortType"/>
</plnk:partnerLinkType>
</wsdl:definitions>
Modified: trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/bpel-deploy.xml
===================================================================
--- trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/bpel-deploy.xml 2010-01-06 12:00:55 UTC (rev 439)
+++ trunk/samples/quickstart/hello_world_header_wsdl/bpelContent/bpel-deploy.xml 2010-01-06 14:14:58 UTC (rev 440)
@@ -24,7 +24,7 @@
<process name="bpl:HelloWorldHeaderWSDL">
<active>true</active>
<provide partnerLink="helloPartnerLink">
- <service name="intf:HelloService" port="HelloPort"/>
+ <service name="intf:HelloHeaderWSService" port="HelloHeaderWSPort"/>
</provide>
</process>
</deploy>
14 years, 11 months
riftsaw SVN: r439 - in trunk: console and 18 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-01-06 07:00:55 -0500 (Wed, 06 Jan 2010)
New Revision: 439
Modified:
trunk/console/identity/pom.xml
trunk/console/integration/pom.xml
trunk/console/pom.xml
trunk/distribution/pom.xml
trunk/distribution/src/main/release/version.properties
trunk/docs/docbook/gettingstartedguide/pom.xml
trunk/docs/docbook/gettingstartedguide/src/main/master.xml
trunk/docs/docbook/gettingstartedguide/src/main/module/examples.xml
trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml
trunk/docs/docbook/pom.xml
trunk/docs/docbook/userguide/pom.xml
trunk/docs/docbook/userguide/src/main/master.xml
trunk/integration-tests/pom.xml
trunk/pom.xml
trunk/qa/build.xml
trunk/qa/hudson-riftsaw-db.sh
trunk/qa/hudson-riftsaw-jboss.sh
trunk/qa/hudson-riftsaw-jdk5.sh
trunk/qa/hudson-riftsaw-ws.sh
trunk/runtime/deployer/pom.xml
trunk/runtime/engine-assembly/pom.xml
trunk/runtime/engine/pom.xml
trunk/runtime/jbossesb-bpel-assembly/pom.xml
trunk/runtime/jbossesb-bpel/pom.xml
trunk/runtime/pom.xml
Log:
Reset trunk back to 2.0-SNAPSHOT version. Currently still using CR1 tag for riftsaw-ODE artifacts, as 2.0-SNAPSHOT artifacts are not available.
Modified: trunk/console/identity/pom.xml
===================================================================
--- trunk/console/identity/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/console/identity/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>identity</artifactId>
<packaging>jar</packaging>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<name>RiftSaw::Console::Identity</name>
<parent>
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>parent</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<build>
Modified: trunk/console/integration/pom.xml
===================================================================
--- trunk/console/integration/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/console/integration/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>integration</artifactId>
<packaging>jar</packaging>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<name>RiftSaw::Console::Integration</name>
<parent>
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>parent</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<!-- Properties -->
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/console/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<name>RiftSaw::Console</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modules>
Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/distribution/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -23,12 +23,12 @@
<artifactId>distribution</artifactId>
<packaging>pom</packaging>
<name>RiftSaw::Distribution</name>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: trunk/distribution/src/main/release/version.properties
===================================================================
--- trunk/distribution/src/main/release/version.properties 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/distribution/src/main/release/version.properties 2010-01-06 12:00:55 UTC (rev 439)
@@ -1 +1 @@
-riftsaw.version=2.0-CR1
+riftsaw.version=2.0-SNAPSHOT
Modified: trunk/docs/docbook/gettingstartedguide/pom.xml
===================================================================
--- trunk/docs/docbook/gettingstartedguide/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/docs/docbook/gettingstartedguide/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -6,14 +6,14 @@
<groupId>org.jboss.soa.bpel.docs</groupId>
<artifactId>gettingstartedguide</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>RiftSaw::Docs::gettingstartedguide</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>docs</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
Modified: trunk/docs/docbook/gettingstartedguide/src/main/master.xml
===================================================================
--- trunk/docs/docbook/gettingstartedguide/src/main/master.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/docs/docbook/gettingstartedguide/src/main/master.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -5,7 +5,7 @@
<book lang="en">
<bookinfo>
- <title>RiftSaw 2.0-CR1</title>
+ <title>RiftSaw 2.0-SNAPSHOT</title>
<subtitle>Getting Started Guide</subtitle>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/>
</bookinfo>
Modified: trunk/docs/docbook/gettingstartedguide/src/main/module/examples.xml
===================================================================
--- trunk/docs/docbook/gettingstartedguide/src/main/module/examples.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/docs/docbook/gettingstartedguide/src/main/module/examples.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -178,7 +178,6 @@
</section>
-<!-- NOT INCLUDED FOR 2.0-CR1
<section>
<title>ESB Examples - Order Management</title>
@@ -271,7 +270,6 @@
</imageobject>
</section>
--->
<section>
<title>Importing Examples into Eclipse</title>
Modified: trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml
===================================================================
--- trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/docs/docbook/gettingstartedguide/src/main/module/installation.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -24,7 +24,7 @@
<listitem>JBossAS (version 5.1.GA or higher), available from <ulink url="http://www.jboss.org/jbossas">http://www.jboss.org/jbossas</ulink></listitem>
<listitem>JBossESB (version 4.7.GA or higher), should download the <emphasis role="bold">jbossesb-4.7.GA.zip</emphasis>, available from <ulink url="http://www.jboss.org/jbossesb">http://www.jboss.org/jbossesb</ulink>.
This is only required to run the ESB/BPEL example.</listitem>
- <listitem>RiftSaw (version 2.0-CR1 or higher), available from <ulink url="http://www.jboss.org/riftsaw">http://www.jboss.org/riftsaw</ulink></listitem>
+ <listitem>RiftSaw (version 2.0 or higher), available from <ulink url="http://www.jboss.org/riftsaw">http://www.jboss.org/riftsaw</ulink></listitem>
<listitem>If using version 5.1.GA of JBossAS then it will be necessary to
upgrade JBossWS (version 3.2.1.GA or higher),
available from <ulink url="http://www.jboss.org/jbossws">http://www.jboss.org/jbossws</ulink></listitem>
Modified: trunk/docs/docbook/pom.xml
===================================================================
--- trunk/docs/docbook/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/docs/docbook/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -6,14 +6,14 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>docs</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RiftSaw::Docs</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<profiles>
Modified: trunk/docs/docbook/userguide/pom.xml
===================================================================
--- trunk/docs/docbook/userguide/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/docs/docbook/userguide/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -6,14 +6,14 @@
<groupId>org.jboss.soa.bpel.docs</groupId>
<artifactId>userguide</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>RiftSaw::Docs::userguide</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>docs</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
Modified: trunk/docs/docbook/userguide/src/main/master.xml
===================================================================
--- trunk/docs/docbook/userguide/src/main/master.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/docs/docbook/userguide/src/main/master.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -5,7 +5,7 @@
<book lang="en">
<bookinfo>
- <title>RiftSaw 2.0-CR1</title>
+ <title>RiftSaw 2.0-SNAPSHOT</title>
<subtitle>User Guide</subtitle>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/>
</bookinfo>
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/integration-tests/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -4,12 +4,12 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>integration-tests</artifactId>
<packaging>pom</packaging>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<name>RiftSaw::Integration-Tests</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<properties>
<jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RiftSaw</name>
<url>http://www.jboss.org/riftsaw</url>
@@ -67,7 +67,7 @@
<properties>
<riftsaw.ode.version>2.0-CR1</riftsaw.ode.version>
- <riftsaw.engine.version>2.0-CR1</riftsaw.engine.version>
+ <riftsaw.engine.version>2.0-SNAPSHOT</riftsaw.engine.version>
<bpm.console.version>1.3.0</bpm.console.version>
<commons.logging.version>1.1.1</commons.logging.version>
<junit.version>3.8.1</junit.version>
Modified: trunk/qa/build.xml
===================================================================
--- trunk/qa/build.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/qa/build.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -9,7 +9,7 @@
<!-- CONFIGURABLE PROPERTIES -->
<property name="database" value="hsqldb" />
- <property name="riftsaw.version" value="2.0-CR1" />
+ <property name="riftsaw.version" value="2.0-SNAPSHOT" />
<property name="riftsaw.home" value="${riftsaw.parent.dir}/riftsaw-${riftsaw.version}" /> <!-- riftsaw.home should not be configured. change riftsaw.parent.dir instead -->
<property name="jboss.parent.dir" value="${riftsaw.home}" />
Modified: trunk/qa/hudson-riftsaw-db.sh
===================================================================
--- trunk/qa/hudson-riftsaw-db.sh 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/qa/hudson-riftsaw-db.sh 2010-01-06 12:00:55 UTC (rev 439)
@@ -7,7 +7,7 @@
RIFTSAW_PARENT_DIR="$WORKSPACE"
JBOSS_VERSION="5.1.0.GA"
-RIFTSAW_VERSION="2.0-CR1"
+RIFTSAW_VERSION="2.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
Modified: trunk/qa/hudson-riftsaw-jboss.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jboss.sh 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/qa/hudson-riftsaw-jboss.sh 2010-01-06 12:00:55 UTC (rev 439)
@@ -7,7 +7,7 @@
RIFTSAW_PARENT_DIR="$WORKSPACE"
JBOSS_VERSION="5.1.0.GA"
-RIFTSAW_VERSION="2.0-CR1"
+RIFTSAW_VERSION="2.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
Modified: trunk/qa/hudson-riftsaw-jdk5.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jdk5.sh 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/qa/hudson-riftsaw-jdk5.sh 2010-01-06 12:00:55 UTC (rev 439)
@@ -9,7 +9,7 @@
DATABASE="hsql"
JBOSS_FILENAME="jboss-$JBOSS_VERSION.zip"
REPLACE_QA_JDBC="true"
-RIFTSAW_VERSION="2.0-CR1"
+RIFTSAW_VERSION="2.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
Modified: trunk/qa/hudson-riftsaw-ws.sh
===================================================================
--- trunk/qa/hudson-riftsaw-ws.sh 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/qa/hudson-riftsaw-ws.sh 2010-01-06 12:00:55 UTC (rev 439)
@@ -6,7 +6,7 @@
RIFTSAW_PARENT_DIR="$WORKSPACE"
JBOSS_VERSION="5.1.0.GA"
DATABASE="hsql"
-RIFTSAW_VERSION="2.0-CR1"
+RIFTSAW_VERSION="2.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
Modified: trunk/runtime/deployer/pom.xml
===================================================================
--- trunk/runtime/deployer/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/runtime/deployer/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>deployer</artifactId>
<packaging>jar</packaging>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::Deployer</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: trunk/runtime/engine/pom.xml
===================================================================
--- trunk/runtime/engine/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/runtime/engine/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>riftsaw-engine</artifactId>
<packaging>jar</packaging>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::Engine</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: trunk/runtime/engine-assembly/pom.xml
===================================================================
--- trunk/runtime/engine-assembly/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/runtime/engine-assembly/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -3,14 +3,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>riftsaw</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<packaging>jboss-sar</packaging>
<name>RiftSaw::Runtime::Engine-Assembly</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: trunk/runtime/jbossesb-bpel/pom.xml
===================================================================
--- trunk/runtime/jbossesb-bpel/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/runtime/jbossesb-bpel/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>jbossesb-bpel</artifactId>
<packaging>jar</packaging>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::JBossESB-BPEL</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: trunk/runtime/jbossesb-bpel-assembly/pom.xml
===================================================================
--- trunk/runtime/jbossesb-bpel-assembly/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/runtime/jbossesb-bpel-assembly/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>bpel.esb</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<packaging>jboss-esb</packaging>
<name>RiftSaw::Runtime::JBossESB-BPEL-Assembly</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2009-12-25 10:12:33 UTC (rev 438)
+++ trunk/runtime/pom.xml 2010-01-06 12:00:55 UTC (rev 439)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
<packaging>pom</packaging>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
<name>RiftSaw::Runtime</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.0-CR1</version>
+ <version>2.0-SNAPSHOT</version>
</parent>
<modules>
14 years, 11 months