Remove compileconf, Glassfish 2.1 dependencies, update HTTP BC and REST BC to versions from separate repositories

master
Vitaliy Filippov 2015-12-26 01:59:16 +03:00
parent 6d34112b44
commit fc7baf637c
690 changed files with 3826 additions and 5966 deletions

8
build.sh Normal file
View File

@ -0,0 +1,8 @@
#!/bin/sh
# Full build script
JV_SRCROOT=`dirname $0`
JV_SRCROOT=`realpath $JV_SRCROOT`
export JV_SRCROOT
mvn clean -Dmaven.repo.local=$JV_SRCROOT/m2/repository $*
mvn install -Dmaven.test.skip=true -e -Dmaven.repo.local=$JV_SRCROOT/m2/repository $*

View File

@ -64,7 +64,6 @@
11/19/09: Ed W.
-->
<property name="junit.maxmemory" value="512m" />
<property name="junit.gfbase" value="${env.JV_GFBASE}" />
<property name="junit.srcroot" value="${project.build.testSourceDirectory}" />
<!-- default ant-junit version if caller does not supply: -->
@ -134,7 +133,6 @@
<property name="echo.jbicomps.junit.sysproperties" refid="jbicomps.junit.sysproperties" />
<echo>
work.dir=${work.dir}
junit.gfbase=${junit.gfbase}
junit.maxmemory=${junit.maxmemory}
junit.srcroot=${junit.srcroot}
jbicomps.junit.sysproperties=${echo.jbicomps.junit.sysproperties}

View File

@ -67,6 +67,9 @@
<jbicomps.currentVersion>3.0.6-SNAPSHOT</jbicomps.currentVersion>
<ojc.default.release.version>3.0.6-SNAPSHOT</ojc.default.release.version>
<!-- The version number for openesb-core components. 2.4.2 is available in central, 2.4.3-SNAPSHOT = git master. -->
<openesb-core-version>2.4.2</openesb-core-version>
<!-- The version number for OSGi bundles. Has to be triple. Cannot be SNAPSHOT. -->
<OSGI_VERSION>3.0.6</OSGI_VERSION>
@ -931,13 +934,6 @@
<version>${iepse.artifact.version}</version>
</dependency>
<!-- special dependency jar to inject appserver classpath: -->
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
<version>${jbicomps.currentVersion}</version>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>restjbiadapter</artifactId>
@ -947,9 +943,9 @@
<groupId>open-jbi-components</groupId>
<artifactId>restbc-installer</artifactId>
<version>${restbc.artifact.version}</version>
</dependency>
<dependency>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>camelseimpl</artifactId>
<version>${camelse.artifact.version}</version>

View File

@ -183,7 +183,6 @@
<!-- required env. vars: -->
<SRCROOT>${env.JV_SRCROOT}</SRCROOT>
<TOOLROOT>${env.JV_TOOLROOT}</TOOLROOT>
<gfbase>${env.JV_GFBASE}</gfbase>
<!-- this file is created by ant task in top pom, and used to filter resources: -->
<version.properties>${SRCROOT}/bld/version.properties</version.properties>

0
nbactions.xml Executable file → Normal file
View File

View File

@ -11,7 +11,6 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
@ -55,9 +54,8 @@
<version>3.0</version>
</dependency>
<dependency>
<groupId>open-esb</groupId>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi-admin-common</artifactId>
<version>1.1</version>
</dependency>
</dependencies>
<build>

View File

@ -107,16 +107,26 @@
<groupId>open-jbi-components</groupId>
<artifactId>bpelmodel</artifactId>
</dependency>
-->
-->
<dependency>
<groupId>open-esb</groupId>
<artifactId>jbi-admin-common</artifactId>
<groupId>org.glassfish</groupId>
<artifactId>javax.management.j2ee</artifactId>
<version>3.0</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi-admin-common</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>

View File

@ -119,7 +119,7 @@
<optional>true</optional>
</dependency>
<dependency>
<groupId>open-esb</groupId>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi-admin-common</artifactId>
<optional>true</optional>
</dependency>

View File

@ -124,7 +124,6 @@
</goals>
<configuration>
<tasks>
<property name="derbylibs" value="${JV_GFBASE}/javadb/lib" />
<property name="derbydb" value="${project.build.directory}/javadb" />
<patternset id="jbicomps.junit.test.patternset" >
@ -142,7 +141,6 @@
<property name="project.build.testSourceDirectory" value="${project.build.testSourceDirectory}" />
<property name="work.dir" value="${project.build.directory}" />
<property name="derbylibs" value="${derbylibs}" />
<property name="derbydb" value="${derbydb}" />
<!-- no junit system properties are needed: -->
@ -170,10 +168,6 @@
<groupId>open-jbi-components</groupId>
<artifactId>componentsl</artifactId>
</dependency>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>debuggerbdi</artifactId>
@ -225,7 +219,6 @@
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<version>2.0</version>
</dependency>
<dependency>
<groupId>js-engine</groupId>

View File

@ -249,7 +249,6 @@
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<version>2.0</version>
<optional>true</optional>
</dependency>
<dependency>

View File

@ -103,10 +103,8 @@
</goals>
<configuration>
<tasks>
<property name="derbylibs" value="${gfbase}/javadb/lib"/>
<property name="derbydb" value="${project.build.directory}/javadb"/>
<property name="junit.srcroot" value="${SRCROOT}"/>
<property name="junit.gfbase" value="${gfbase}"/>
<property name="junit.suite.classpath" refid="maven.test.classpath"/>
<patternset id="jbicomps.junit.test.patternset">
<include name="**/*Test.java"/>
@ -119,11 +117,9 @@
<property name="project.build.directory" value="${project.build.directory}"/>
<property name="project.build.testSourceDirectory" value="${project.build.testSourceDirectory}"/>
<property name="work.dir" value="${project.build.directory}"/>
<property name="derbylibs" value="${derbylibs}"/>
<property name="derbydb" value="${derbydb}"/>
<propertyset id="jbicomps.junit.sysproperties">
<propertyref name="junit.srcroot"/>
<propertyref name="junit.gfbase"/>
<propertyref name="junit.suite.classpath"/>
</propertyset>
<reference refid="maven.test.classpath"/>

View File

@ -160,17 +160,11 @@ java.lang.NoSuchMethodError: org.codehaus.plexus.util.cli.Commandline.createArg(
</build>
<dependencyManagement>
<dependencies>
<!-- <dependency>
<groupId>ant</groupId>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.6.5</version>
</dependency> -->
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant</artifactId>
<version>1.7.1</version>
</dependency>
<version>1.7.1</version>
</dependency>
<dependency>
<groupId>ant</groupId>
<artifactId>ant-nodeps</artifactId>
@ -283,11 +277,6 @@ java.lang.NoSuchMethodError: org.codehaus.plexus.util.cli.Commandline.createArg(
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
<artifactId>jaxb-xjc</artifactId>
@ -549,27 +538,43 @@ java.lang.NoSuchMethodError: org.codehaus.plexus.util.cli.Commandline.createArg(
<artifactId>serializer</artifactId>
<version>1.0</version>
</dependency>
<!-- open-esb dependency versions: -->
<dependency>
<groupId>open-esb</groupId>
<artifactId>jbi</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>open-esb</groupId>
<artifactId>jbi-ext</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>open-esb</groupId>
<artifactId>jbi-admin-common</artifactId>
<version>1.1</version>
</dependency>
<dependency>
<groupId>opensymphony</groupId>
<artifactId>quartz-all</artifactId>
<version>1.6.1</version>
</dependency>
<dependency>
<groupId>net.java.hulp.i18ntask</groupId>
<artifactId>net.java.hulp.i18ntask</artifactId>
<version>${I18NTASK_VERSION}</version>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.impl</artifactId>
<version>2.1-SNAPSHOT</version>
</dependency>
<!-- open-esb dependency versions: -->
<dependency>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi</artifactId>
<version>${openesb-core-version}</version>
</dependency>
<dependency>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi-ext</artifactId>
<version>${openesb-core-version}</version>
</dependency>
<dependency>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi-admin-common</artifactId>
<version>${openesb-core-version}</version>
</dependency>
</dependencies>
</dependencyManagement>

View File

@ -85,11 +85,7 @@
</build>
<dependencies>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-esb</groupId>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi-admin-common</artifactId>
</dependency>
<dependency>
@ -120,5 +116,35 @@
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</dependency>
<dependency>
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0.2</version>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>
<version>6.0</version>
</dependency>
<dependency>
<groupId>glassfish</groupId>
<artifactId>appserv-rt</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>glassfish</groupId>
<artifactId>appserv-admin</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>glassfish</groupId>
<artifactId>appserv-se</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>glassfish</groupId>
<artifactId>appserv-ext</artifactId>
<version>1.0</version>
</dependency>
</dependencies>
</project>

View File

@ -55,10 +55,6 @@
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
</dependency>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>camimpl</artifactId>

View File

@ -52,11 +52,7 @@
</build>
<dependencies>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-esb</groupId>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi-admin-common</artifactId>
</dependency>
<dependency>

View File

@ -100,11 +100,6 @@
</dependency>-->
<!-- TEST DEPENDENCIES-->
<!--<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
<scope>test</scope>

View File

@ -231,13 +231,11 @@
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.impl</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>-->
</dependencies>

View File

@ -1,99 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project
name="compileconf" default="run">
<target name="create-compileconf" >
<!-- initialize properties for compileconf jar: -->
<pathconvert property="compileconf_dir">
<path>
<pathelement location="${maven.repo.local}/jbicompsplatform/compileconf/${jbicomps.currentVersion}"/>
</path>
</pathconvert>
<property name="compileconf_jar"
value="${project.build.directory}${file.separator}compileconf-${jbicomps.currentVersion}.jar"
/>
<mkdir dir="${project.build.directory}"/>
<!--
# prime maven repository with appserver jars that we link against
# we do a clean install to avoid upgrade/downgrade issues:
-->
<delete dir="${compileconf_dir}" />
<copy todir="${compileconf_dir}" preservelastmodified="true" overwrite="false" >
<fileset dir="${gfbase}/lib" >
<!-- files common to ee81 and glassfish -->
<include name="activation.jar"/>
<include name="ant/lib/ant.jar"/>
<include name="appserv-admin.jar"/>
<include name="appserv-rt.jar"/>
<include name="j2ee.jar"/>
<include name="jmxremote_optional.jar"/>
<include name="mail.jar"/>
<!-- files specific to ee81 -->
<include name="dom.jar"/>
<include name="jaxrpc-impl.jar"/>
<include name="jmxremote.jar"/>
<include name="saaj-impl.jar"/>
<include name="xalan.jar"/>
<include name="xercesImpl.jar"/>
<!-- files specific to glassfish -->
<include name="appserv-deployment-client.jar"/>
<include name="appserv-ext.jar"/>
<include name="appserv-se.jar"/>
<include name="javaee.jar"/>
<include name="jsf-impl.jar"/>
<include name="webservices-rt.jar"/>
</fileset>
</copy>
<!-- prime maven repository with imq jars that we link against -->
<copy todir="${compileconf_dir}" preservelastmodified="true" overwrite="false" >
<fileset dir="${gfbase}/imq/lib" >
<!-- files common to ee81 and glassfish -->
<include name="imq.jar"/>
</fileset>
</copy>
<!-- prime maven repository with jbi jars that we link against -->
<!--
<copy todir="${compileconf_dir}" preservelastmodified="true" overwrite="false" >
<fileset dir="${gfbase}/jbi/lib" >
<include name="jbi.jar"/>
<include name="jbi-admin-common.jar"/>
</fileset>
</copy>
-->
<!--
# create compileconf.jar in 4 steps.
-->
<!-- 1. set list of jars to include in the manifest class-path: -->
<fileset id="jarlist" dir="${compileconf_dir}">
<include name="**/*.jar"/>
</fileset>
<!-- 2. delete the old jar if it is there: -->
<delete file="${compileconf_jar}" />
<!-- 3. convert classpath to relative files names: -->
<pathconvert dirsep="/" pathsep=" " property="jarlist" refid="jarlist">
<!-- note: "from" attribute must be in local path format. RT 5/16/06 -->
<map from="${compileconf_dir}${file.separator}" to="" />
</pathconvert>
<!-- 4. create the jar.
# NOTE: jar manifest classpaths are NOT recognized by javac prior to JDK 5.0.
# See: http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4212732
-->
<jar destfile="${compileconf_jar}">
<manifest>
<attribute name="Class-Path" value= "${jarlist}" />
</manifest>
</jar>
<echo message="Compile Classpath is ${jarlist}, output is ${compileconf_jar}" />
</target>
</project>

View File

@ -45,39 +45,6 @@
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>top_clean</id>
<phase>clean</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<ant antfile="${SRCROOT}/global-common/m2.ant" dir="${basedir}" target="clean_top" >
<property name="SRCROOT" value="${SRCROOT}" />
<property name="maven.repo.local" value="${maven.repo.local}" />
</ant>
</tasks>
</configuration>
</execution>
<execution>
<id>${project.artifactId}-create-jar</id>
<phase>clean</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<ant antfile="m2.ant" dir="${basedir}" target="create-compileconf" >
<property environment="env" />
<property name="gfbase" value="${gfbase}" />
<property name="maven.repo.local" value="${maven.repo.local}" />
<property name="jbicomps.currentVersion" value="${jbicomps.currentVersion}" />
<property name="project.build.directory" value="${project.build.directory}" />
</ant>
</tasks>
</configuration>
</execution>
<execution>
<id>download-ojdbc5</id>
<phase>clean</phase>
@ -249,21 +216,6 @@
<file>${SRCROOT}/ojc-core/vendor-libs/woodstock/jars/webui-jsf-4.0.jar</file>
</configuration>
</execution>
<execution>
<id>install-compileconf</id>
<phase>clean</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<generatePom>true</generatePom>
<packaging>jar</packaging>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
<version>${jbicomps.currentVersion}</version>
<file>${project.build.directory}${file.separator}compileconf-${jbicomps.currentVersion}.jar</file>
</configuration>
</execution>
<execution>
<id>install-jinterop-j-interop</id>
<phase>clean</phase>
@ -804,51 +756,10 @@
</execution>
<!-- OPEN-ESB dependencies -->
<execution>
<id>install-jbi</id>
<phase>clean</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<generatePom>true</generatePom>
<packaging>jar</packaging>
<groupId>open-esb</groupId>
<artifactId>jbi</artifactId>
<version>${OPEN_ESB_VERSION}</version>
<file>${gfbase}/jbi/lib/jbi.jar</file>
</configuration>
</execution>
<execution>
<id>install-jbi-ext</id>
<phase>clean</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<generatePom>true</generatePom>
<packaging>jar</packaging>
<groupId>open-esb</groupId>
<artifactId>jbi-ext</artifactId>
<version>${OPEN_ESB_VERSION}</version>
<file>${gfbase}/jbi/lib/jbi-ext.jar</file>
</configuration>
</execution>
<execution>
<id>install-jbi-admin-common</id>
<phase>clean</phase>
<goals>
<goal>install-file</goal>
</goals>
<configuration>
<generatePom>true</generatePom>
<packaging>jar</packaging>
<groupId>open-esb</groupId>
<artifactId>jbi-admin-common</artifactId>
<version>1.1</version>
<file>${gfbase}/jbi/lib/jbi-admin-common.jar</file>
</configuration>
</execution>
<!-- openesb-core/jbi/api -->
<!-- openesb-core/esb-packages/jbi-ext -->
<!-- openesb-core/ri-clients/jbi-admin-common -->
<execution>
<id>install-hulp-meas-itf</id>
<phase>clean</phase>

View File

@ -102,7 +102,7 @@
</build>
<dependencies>
<dependency>
<groupId>open-esb</groupId>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi</artifactId>
</dependency>
<dependency>

View File

@ -77,13 +77,12 @@
</build>
<dependencies>
<dependency>
<groupId>open-esb</groupId>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi</artifactId>
</dependency>
<dependency>
<groupId>net.java.hulp.i18ntask</groupId>
<artifactId>net.java.hulp.i18ntask</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>

View File

@ -93,7 +93,7 @@
<artifactId>wsdl4j</artifactId>
</dependency>
<dependency>
<groupId>open-esb</groupId>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi</artifactId>
</dependency>
<!-- TEST DEPENDENCIES-->

View File

@ -79,13 +79,12 @@
</build>
<dependencies>
<dependency>
<groupId>open-esb</groupId>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi</artifactId>
</dependency>
<dependency>
<groupId>net.java.hulp.i18ntask</groupId>
<artifactId>net.java.hulp.i18ntask</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>

View File

@ -64,10 +64,6 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>javax</groupId>
<artifactId>javaee-api</artifactId>

View File

@ -72,6 +72,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>

View File

@ -71,7 +71,7 @@
</build>
<dependencies>
<dependency>
<groupId>open-esb</groupId>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi</artifactId>
</dependency>
<dependency>

View File

@ -84,7 +84,7 @@
</build>
<dependencies>
<dependency>
<groupId>open-esb</groupId>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi</artifactId>
</dependency>
<dependency>

View File

@ -58,14 +58,9 @@
<groupId>open-jbi-components</groupId>
<artifactId>componentsl</artifactId>
</dependency>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>wsdl4j</groupId>

View File

@ -188,17 +188,15 @@
<artifactId>jsr173_api</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.impl</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

View File

@ -56,10 +56,6 @@
<groupId>open-jbi-components</groupId>
<artifactId>componentsl</artifactId>
</dependency>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>encoder-fw</artifactId>

View File

@ -68,10 +68,6 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>encoder-fw</artifactId>

View File

@ -143,10 +143,6 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>encoder-fw</artifactId>

View File

@ -144,10 +144,6 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>encoder-fw</artifactId>

View File

@ -137,10 +137,6 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>encoder-fw</artifactId>

View File

@ -145,10 +145,6 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>encoder-fw</artifactId>

View File

@ -143,10 +143,6 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>encoder-fw</artifactId>

View File

@ -59,10 +59,6 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>componentsl</artifactId>

View File

@ -77,10 +77,6 @@
</plugins>
</build>
<dependencies>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>etlmonitor</artifactId>
@ -118,6 +114,16 @@
<artifactId>webui-jsf</artifactId>
<version>4.0</version>
</dependency>
<dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>1.2</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
</dependency>
</dependencies>
<properties>
<msgs.package>com/sun/jbi/cam/plugin/etlse/model</msgs.package>

View File

@ -171,11 +171,6 @@
<version>build210</version>
</dependency>
<!-- TEST DEPENDENCIES-->
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>

View File

@ -180,12 +180,18 @@
<groupId>open-jbi-components</groupId>
<artifactId>compositelock</artifactId>
</dependency>
<!-- TEST DEPENDENCIES-->
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
<scope>test</scope>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.impl</artifactId>
<optional>true</optional>
</dependency>
<!-- TEST DEPENDENCIES-->
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>
@ -198,20 +204,7 @@
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.impl</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>open-esb</groupId>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi-admin-common</artifactId>
<scope>test</scope>
</dependency>

View File

@ -163,13 +163,11 @@
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.impl</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@ -93,10 +93,10 @@
<groupId>open-jbi-components</groupId>
<artifactId>encoder-fw</artifactId>
</dependency>
<dependency>
<groupId>open-esb</groupId>
<!--<dependency>
<groupId>net.open-esb.core</groupId>
<artifactId>jbi-ext</artifactId>
</dependency>
</dependency>-->
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>qos</artifactId>
@ -106,7 +106,17 @@
<groupId>open-jbi-components</groupId>
<artifactId>compositelock</artifactId>
</dependency>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
</dependency>
<!-- TEST DEPENDENCIES-->
<dependency>
<groupId>org.apache.derby</groupId>
<artifactId>derbyclient</artifactId>
@ -122,23 +132,5 @@
<artifactId>ant-junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>oro</groupId>
<artifactId>oro</artifactId>
<optional>true</optional>
</dependency>
<!-- TEST DEPENDENCIES-->
<dependency>
<groupId>com.sun.jbi</groupId>
<artifactId>componentsl</artifactId>
<version>1.0</version>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<version>2.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

View File

@ -199,13 +199,11 @@
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.impl</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
</dependencies>

View File

@ -145,11 +145,6 @@
<artifactId>componentsl</artifactId>
</dependency>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
</dependency>
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>encoder-fw</artifactId>
@ -183,19 +178,14 @@
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.impl</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
<!-- TEST DEPENDENCIES-->
<dependency>
<groupId>jmock</groupId>
<artifactId>jmock</artifactId>

View File

@ -216,13 +216,11 @@
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.impl</artifactId>
<optional>true</optional>
<version>2.1-SNAPSHOT</version>
</dependency>
</dependencies>
</project>

3
ojc-core/httpsoapbc/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
!.gitignore
target/

View File

@ -1,157 +1,118 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
# BEGIN_HEADER - DO NOT EDIT
#
# The contents of this file are subject to the terms
# of the Common Development and Distribution License
# (the "License"). You may not use this file except
# in compliance with the License.
#
# You can obtain a copy of the license at
# https://open-jbi-components.dev.java.net/public/CDDLv1.0.html.
# See the License for the specific language governing
# permissions and limitations under the License.
#
# When distributing Covered Code, include this CDDL
# HEADER in each file and include the License file at
# https://open-jbi-components.dev.java.net/public/CDDLv1.0.html.
# If applicable add the following below this CDDL HEADER,
# with the fields enclosed by brackets "[]" replaced with
# your own identifying information: Portions Copyright
# [year] [name of copyright owner]
-->
<!--
# @(#)pom.xml
# Copyright 2006-2008 Sun Microsystems, Inc. All Rights Reserved.
#
# END_HEADER - DO NOT EDIT
-->
<project>
<parent>
<artifactId>build-common</artifactId>
<groupId>open-jbi-components</groupId>
<version>1.1</version>
<relativePath>../../build-common</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>open-jbi-components</groupId>
<parent>
<groupId>net.open-esb.components.httpbc</groupId>
<artifactId>parent</artifactId>
<version>${httpsoapbc.artifact.version}</version>
</parent>
<artifactId>httpsoapbcimpl</artifactId>
<name>httpsoapbcimpl</name>
<name>OpenESB - Components - HTTPBC - Implementation</name>
<version>${httpsoapbc.artifact.version}</version>
<description>httpsoapbcimpl description</description>
<properties>
<component.name>sun-http-binding</component.name>
</properties>
<build>
<plugins>
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
<execution>
<id>${project.artifactId}-ant-junit</id>
<phase>test</phase>
<goals>
<goal>run</goal>
</goals>
<configuration>
<tasks>
<patternset id="jbicomps.junit.test.patternset" >
<exclude name="**/framework/*.java"/>
<exclude name="**/integrationtest/*.java"/>
<exclude name="**/test/jbi/integration/**/*.java"/>
<include name="**/*Test*.java"/>
</patternset>
<ant antfile="${SRCROOT}/global-common/m2.ant"
dir="${project.build.sourceDirectory}/.." target="run_junit" >
<property name="maven.test.skip" value="${maven.test.skip}" />
<property name="maven.repo.local" value="${maven.repo.local}" />
<property name="project.artifactId" value="${project.artifactId}" />
<property name="project.build.directory" value="${project.build.directory}" />
<property name="project.build.testSourceDirectory" value="${project.build.testSourceDirectory}" />
<!-- no junit system properties are needed: -->
<propertyset id="jbicomps.junit.sysproperties" />
<reference refid="maven.test.classpath"/>
<reference refid="jbicomps.junit.sysproperties"/>
<reference refid="jbicomps.junit.test.patternset"/>
</ant>
</tasks>
</configuration>
</execution>
</executions>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
<configuration>
<archive>
<manifestEntries>
<Component-Version>${httpbc.artifact.version}</Component-Version>
<Component-Version>${project.version}</Component-Version>
<Component-Name>${component.name}</Component-Name>
</manifestEntries>
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
<excludes>
<exclude>**/framework/*.java</exclude>
<exclude>**/integrationtest/*.java</exclude>
<exclude>**/test/jbi/integration/**/*.java</exclude>
<exclude>**/validator/*.java</exclude>
</excludes>
</configuration>
</plugin>
</plugins>
</build>
<dependencies>
<!-- OpenESB Components Common dependencies -->
<dependency>
<groupId>open-jbi-components</groupId>
<artifactId>componentsl</artifactId>
</dependency>
<dependency>
<groupId>jbicompsplatform</groupId>
<artifactId>compileconf</artifactId>
<groupId>open-jbi-components</groupId>
<artifactId>qos</artifactId>
</dependency>
<dependency>
<groupId>sun-identity</groupId>
<artifactId>amclientsdk</artifactId>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
<dependency>
<groupId>net.sf.hulp.meas</groupId>
<artifactId>net.sf.hulp.meas.itf</artifactId>
<version>2.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>open-esb</groupId>
<artifactId>jbi-ext</artifactId>