Author: mriou
Date: Thu Aug 31 11:54:24 2006
New Revision: 439007
URL: http://svn.apache.org/viewvc?rev=439007&view=rev
Log:
ODE-16 Nice distro for the JBI package as well. Same as Axis2, only
distributing the service assembly zip instead of a war and used JBI examples.
Removed:
incubator/ode/trunk/distro-axis2/src/.cvsignore
incubator/ode/trunk/distro-axis2/src/main/dist/
incubator/ode/trunk/distro-jbi/build-jdoc.xml
incubator/ode/trunk/distro-jbi/build.properties
incubator/ode/trunk/distro-jbi/debug/
incubator/ode/trunk/distro-jbi/src/.cvsignore
incubator/ode/trunk/distro-jbi/src/CPL.txt
incubator/ode/trunk/distro-jbi/src/LICENSE.txt
incubator/ode/trunk/distro-jbi/src/MIT_LICENSE.txt
incubator/ode/trunk/distro-jbi/src/README.txt
incubator/ode/trunk/distro-jbi/src/main/dist/
incubator/ode/trunk/distro-jbi/test/
Modified:
incubator/ode/trunk/distro-jbi/build.xml
incubator/ode/trunk/distro-jbi/pom.xml
incubator/ode/trunk/distro-jbi/src/main/assembly/assembly.xml
incubator/ode/trunk/jbi-examples/src/examples/example.properties
incubator/ode/trunk/jbi-install/pom.xml
Modified: incubator/ode/trunk/distro-jbi/build.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/distro-jbi/build.xml?rev=439007&r1=439006&r2=439007&view=diff
==============================================================================
--- incubator/ode/trunk/distro-jbi/build.xml (original)
+++ incubator/ode/trunk/distro-jbi/build.xml Thu Aug 31 11:54:24 2006
@@ -2,135 +2,29 @@
<project name="ODE" default="stage">
- <import file="build-jdoc.xml" />
-
- <property file="../build.properties" />
-
- <property name="build.dir" value="${basedir}/target/stage" />
- <property name="build.dir.schemadoc" value="${build.dir}/schemadoc" />
- <property name="src" value="${basedir}/src/main/dist" />
- <property name="src.bin" value="${src}/bin" />
- <property name="stage" location="target/stage" />
- <property name="stage.bin" location="${stage}/bin" />
- <property name="stage.lib" location="${stage}/lib" />
- <property name="stage.logs" location="${stage}/logs" />
- <property name="stage.docs" location="${stage}/docs" />
- <property name="stage.examples" location="${stage}/examples" />
- <property name="stage.src" location="${stage}/src" />
- <property name="stage.etc" location="${stage}/etc" />
-
- <target name="init">
- <mkdir dir="${build.dir}" />
- </target>
-
- <target name="docs" depends="apidocs, schemadocs" unless="skip.docs" />
-
- <target name="apidocs" depends="javadoc-ode-public"
- unless="skip.docs"
- description="generate API documentation (Javadoc) and place in
the staging area." />
-
- <target name="stage" depends="init" description="stage a distribution">
- <mkdir dir="${stage}" />
-
- <copy flatten="yes" todir="${stage}">
- <fileset dir="${src}" includes="*.txt" />
- </copy>
- <mkdir dir="${stage.bin}" />
- <mkdir dir="${stage.lib}" />
- <mkdir dir="${stage.logs}" />
- <mkdir dir="${stage.docs}" />
- <mkdir dir="${stage.examples}" />
-
- <mkdir dir="${stage.src}" />
-
- <antcall target="_stage_executables" />
- <antcall target="_stage_etc" />
- <antcall target="_stage_bshcmds" />
- <antcall target="_stage_spexerciser" />
- <antcall target="_stage_documentation" />
- </target>
-
- <target name="_stage_etc">
- <mkdir dir="${stage.etc}" />
- <mkdir dir="${stage.etc}/deploy" />
- <copy todir="${stage.etc}">
- <filterset>
- <filter token="ODE_HTTP_PORT" value="${ode.default.http.port}"/>
- <filter token="ODE_RMI_PORT" value="${ode.default.rmi.port}"/>
- <filter token="ODE_JMX_PORT" value="${ode.default.jmx.port}"/>
- <filter token="ODE_JMX_USERNAME" value="${ode.default.jmx.username}"/>
- <filter token="ODE_JMX_PASSWORD" value="${ode.default.jmx.password}"/>
- <filter token="ODE_DOMAIN" value="${ode.default.domain}"/>
- </filterset>
- <fileset dir="${src}/etc" includes="**/*" />
- </copy>
- </target>
-
- <target name="_stage_info">
- <copy todir="${stage}">
- <fileset dir="${src}" includes="**/*.in" />
- </copy>
- </target>
-
- <target name="_stage_extras">
- <mkdir dir="${stage}/extras" />
- <copy todir="${stage}/extras">
- <fileset dir="${src}/extras" includes="**/*" />
- </copy>
- </target>
-
-
- <target name="_stage_bshcmds">
- <mkdir dir="${stage}/bsh-cmds" />
- <copy todir="${stage}/bsh-cmds">
- <fileset dir="${src}/bsh-cmds" includes="**/*" />
- </copy>
- </target>
-
- <target name="_stage_documentation" unless="skip.docs">
- <description>Place documentation in the staging area.</description>
- <!-- Copy API documentation -->
- <mkdir dir="${stage.docs}/apidocs" />
- <copy failonerror="false" todir="${stage.docs}/apidocs">
- <fileset dir="${build.dir.javadoc}/ode-api" includes="**/*" />
- </copy>
-
- <mkdir dir="${stage.docs}/schemadocs" />
- <copy failonerror="false" todir="${stage.docs}/schemadocs">
- <fileset dir="${build.dir.schemadoc}" includes="**/*.html" />
- </copy>
-
- <mkdir dir="${stage.docs}/schemas" />
- <copy failonerror="false" todir="${stage.docs}/schemas">
- <fileset dir="../" includes="*/src/**/*.xsd" />
- <mapper type="flatten" />
- </copy>
-
- </target>
-
- <!-- Make all the UNIX/Windows executables. -->
- <target name="_stage_executables">
- <description>Build the various commandline executables and place them in
the staging area.</description>
- <!-- Copy the ode and ode.bat into the output directory. -->
- <copy todir="${stage.bin}" overwrite="true">
- <fileset dir="${src.bin}">
- <include name="ode" />
- <include name="ode.bat" />
- <include name="ode.cfg" />
- </fileset>
- </copy>
- <chmod perm="755" dir="${stage.bin}" includes="*" excludes="*.bat" />
- </target>
-
- <target name="_stage_spexerciser">
- <mkdir dir="${stage}/examples/spexerciser/1.1" />
- <mkdir dir="${stage}/examples/spexerciser/2.0" />
- <copy todir="${stage}/examples/spexerciser/1.1" includeEmptyDirs="false">
- <fileset dir="../bpel-scripts/src/main/resources/1.1/good"
includes="**/*" />
- </copy>
- <copy todir="${stage}/examples/spexerciser/2.0" includeEmptyDirs="false">
- <fileset dir="../bpel-scripts/src/main/resources/2.0/good"
includes="**/*" />
- </copy>
- </target>
+ <property name="build.dir" value="${basedir}/target/stage" />
+ <property name="src" value="${basedir}/src/main/dist" />
+ <property name="src.bin" value="${src}/bin" />
+ <property name="stage" location="target/stage" />
+ <property name="stage.bin" location="${stage}/bin" />
+
+ <target name="init">
+ <mkdir dir="${build.dir}" />
+ </target>
+
+ <target name="stage" depends="init" description="stage a distribution">
+ <mkdir dir="${stage}" />
+ <antcall target="_stage_license" />
+ </target>
+
+ <target name="_stage_license">
+ <copy todir="${stage}" overwrite="true">
+ <fileset dir="..">
+ <include name="LICENSE"/>
+ <include name="NOTICE"/>
+ <include name="DISCLAIMER"/>
+ </fileset>
+ </copy>
+ </target>
</project>
Modified: incubator/ode/trunk/distro-jbi/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/distro-jbi/pom.xml?rev=439007&r1=439006&r2=439007&view=diff
==============================================================================
--- incubator/ode/trunk/distro-jbi/pom.xml (original)
+++ incubator/ode/trunk/distro-jbi/pom.xml Thu Aug 31 11:54:24 2006
@@ -1,143 +1,154 @@
<?xml version="1.0"?>
<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";>
- <groupId>ode</groupId>
- <artifactId>ode-distro-jbi</artifactId>
- <name>ODE :: JBI Distribution</name>
- <description>An artifact consisting of complete ODE for JBI
distribution.</description>
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
<groupId>ode</groupId>
- <artifactId>ode</artifactId>
- <version>2.0-SNAPSHOT</version>
- </parent>
- <version>2.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <dependencies>
-
- <!--
- | Dependency on the bootstrap class-loader. This is used
- | by the various ODE command-line utilities (in the ./bin
- | directory) to simplify classpath setting.
- -->
- <dependency>
- <groupId>ode</groupId>
- <artifactId>ode-bootstrap</artifactId>
- </dependency>
-
- <!--
- | Dependency on the ode kernel. The kernel provides the
- | a very basic infrastructure for loading "modules". It
- | also provides a "Main" class for starting the ODE server.
- -->
-
- <!--
- | Dependencies for the service provider implementations.
- -->
-
- <dependency>
- <groupId>ode</groupId>
- <artifactId>ode-tools</artifactId>
- </dependency>
+ <artifactId>distro-jbi</artifactId>
+ <name>ODE :: JBI Distribution</name>
+ <description>An artifact consisting of complete ODE for JBI
distribution.</description>
- <dependency>
- <groupId>ode</groupId>
- <artifactId>ode-bpel-schemas</artifactId>
- </dependency>
-
- <dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
<groupId>ode</groupId>
- <artifactId>ode-jbi</artifactId>
- </dependency>
+ <artifactId>ode</artifactId>
+ <version>2.0-SNAPSHOT</version>
+ </parent>
+ <version>2.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
-
-
- <!--
- | Dependency on the JDBC driver shipped with standalone distro.
- -->
- <dependency>
- <groupId>org.apache.derby</groupId>
- <artifactId>derby</artifactId>
- </dependency>
-
- <dependency>
- <groupId>ode</groupId>
- <artifactId>ode-tools-bin</artifactId>
- <type>tar</type>
- <classifier>tar</classifier>
- <scope>compile</scope>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>ode</groupId>
- <artifactId>ode-jbi-examples</artifactId>
- <type>tar</type>
- <classifier>tar</classifier>
- <scope>compile</scope>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>ode</groupId>
- <artifactId>ode-dao-hibernate-db-derby</artifactId>
- <type>tar</type>
- <scope>compile</scope>
- </dependency>
-
-<!-- <dependency>
- <groupId>ode</groupId>
- <artifactId>ode-jbi-install</artifactId>
- <type>zip</type>
- <scope>compile</scope>
- </dependency>
--->
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <phase>generate-sources</phase>
- <configuration>
- <tasks>
- <ant antfile="build.xml" target="stage"/>
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>src/main/assembly/assembly.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
+ <dependencies>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-bootstrap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-tools</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-bpel-compiler</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-bpel-bom</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-bpel-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-bpel-el-xpath10</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-bpel-el-xpath20</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-bpel-obj</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-bpel-parser</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-jbi-install</artifactId>
+ <type>zip</type>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-tools-bin</artifactId>
+ <type>tar</type>
+ <classifier>tar</classifier>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>ode</groupId>
+ <artifactId>ode-jbi-examples</artifactId>
+ <type>tar</type>
+ <classifier>tar</classifier>
+ <version>${project.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-dom</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-xpath</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.0</version>
+ <executions>
+ <execution>
+ <phase>generate-sources</phase>
+ <configuration>
+ <tasks>
+ <ant antfile="build.xml" target="stage"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/assembly.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: incubator/ode/trunk/distro-jbi/src/main/assembly/assembly.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/distro-jbi/src/main/assembly/assembly.xml?rev=439007&r1=439006&r2=439007&view=diff
==============================================================================
--- incubator/ode/trunk/distro-jbi/src/main/assembly/assembly.xml (original)
+++ incubator/ode/trunk/distro-jbi/src/main/assembly/assembly.xml Thu Aug 31
11:54:24 2006
@@ -13,46 +13,63 @@
<directory>target/stage/bin</directory>
<outputDirectory>bin</outputDirectory>
<fileMode>0755</fileMode>
- <excludes>
- <exclude>*.bat</exclude>
- </excludes>
+ <excludes>
+ <exclude>*.bat</exclude>
+ </excludes>
</fileSet>
</fileSets>
<dependencySets>
<dependencySet>
- <scope>compile</scope>
+ <scope>runtime</scope>
+ <outputDirectory>lib</outputDirectory>
+
<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
+ <includes>
+ <include>ode:ode-utils</include>
+ <include>ode:ode-tools</include>
+ <include>ode:ode-bpel-compiler</include>
+ <include>ode:ode-bpel-bom</include>
+ <include>ode:ode-bpel-api</include>
+ <include>ode:ode-bpel-el-xpath10</include>
+ <include>ode:ode-bpel-el-xpath20</include>
+ <include>ode:ode-bpel-obj</include>
+ <include>ode:ode-bpel-parser</include>
+ <include>ode:ode-bpel-schemas</include>
+ </includes>
+ </dependencySet>
+ <dependencySet>
+ <scope>runtime</scope>
<outputDirectory/>
- <includes>
- <include>ode:ode-tools-bin</include>
- </includes>
+ <includes>
+ <include>ode:ode-jbi-examples</include>
+ <include>ode:ode-tools-bin</include>
+ </includes>
<unpack>true</unpack>
</dependencySet>
-
<dependencySet>
<scope>runtime</scope>
- <outputDirectory>lib</outputDirectory>
- <excludes>
- <exclude>ode:ode-bootstrap</exclude>
- </excludes>
+ <outputDirectory/>
+
<outputFileNameMapping>${groupId}.${extension}</outputFileNameMapping>
+ <includes>
+ <include>ode:ode-jbi-install</include>
+ </includes>
</dependencySet>
<dependencySet>
<scope>runtime</scope>
<outputDirectory>lib</outputDirectory>
-
<outputFileNameMapping>${artifactId}.${extension}</outputFileNameMapping>
- <includes>
- <include>ode:ode-bootstrap</include>
- </includes>
- </dependencySet>
-
- <dependencySet>
- <scope>compile</scope>
- <outputDirectory/>
- <includes>
- <include>ode:ode-jbi-examples</include>
- <include>ode:ode-dao-hibernate-db-derby</include>
- </includes>
- <unpack>true</unpack>
+ <includes>
+ <include>commons-logging:commons-logging</include>
+ <include>commons-codec:commons-codec</include>
+ <include>commons-httpclient:commons-httpclient</include>
+ <include>commons-pool:commons-pool</include>
+ <include>commons-collections:commons-collections</include>
+ <include>jaxen:jaxen</include>
+ <include>net.sf.saxon:saxon</include>
+ <include>net.sf.saxon:saxon-xpath</include>
+ <include>net.sf.saxon:saxon-dom</include>
+ <include>log4j:log4j</include>
+ <include>wsdl4j:wsdl4j</include>
+ </includes>
</dependencySet>
- </dependencySets>
+ </dependencySets>
</assembly>
Modified: incubator/ode/trunk/jbi-examples/src/examples/example.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/jbi-examples/src/examples/example.properties?rev=439007&r1=439006&r2=439007&view=diff
==============================================================================
--- incubator/ode/trunk/jbi-examples/src/examples/example.properties (original)
+++ incubator/ode/trunk/jbi-examples/src/examples/example.properties Thu Aug 31
11:54:24 2006
@@ -4,6 +4,6 @@
ode.start.args=-v -console
ode.javaopts.env=
-
ode.default.http.port=8080
+ode.home=../../bin
\ No newline at end of file
Modified: incubator/ode/trunk/jbi-install/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/jbi-install/pom.xml?rev=439007&r1=439006&r2=439007&view=diff
==============================================================================
--- incubator/ode/trunk/jbi-install/pom.xml (original)
+++ incubator/ode/trunk/jbi-install/pom.xml Thu Aug 31 11:54:24 2006
@@ -65,7 +65,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<executions>
<execution>
- <phase>install</phase>
+ <phase>package</phase>
<goals>
<goal>attached</goal>
</goals>
