[jboss-svn-commits] JBL Code SVN: r28009 - in labs/jbossesb/trunk/product/services: soap and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Jul 14 10:57:55 EDT 2009
Author: kevin.conner at jboss.com
Date: 2009-07-14 10:57:55 -0400 (Tue, 14 Jul 2009)
New Revision: 28009
Removed:
labs/jbossesb/trunk/product/services/soap/base-project-build.xml
Modified:
labs/jbossesb/trunk/product/services/base-project-build.xml
labs/jbossesb/trunk/product/services/soap/build.properties
labs/jbossesb/trunk/product/services/soap/build.xml
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java
labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java
Log:
Tidy up soap build: JBESB-2743
Modified: labs/jbossesb/trunk/product/services/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/base-project-build.xml 2009-07-14 14:52:17 UTC (rev 28008)
+++ labs/jbossesb/trunk/product/services/base-project-build.xml 2009-07-14 14:57:55 UTC (rev 28009)
@@ -29,7 +29,7 @@
</path>
<taskdef resource="emma_ant.properties" classpathref="emma.libs" />
- <path id="classpath">
+ <path id="base-classpath">
<pathelement location="src/test/resources"/>
<pathelement location="build/${ant.project.name}.esb" />
<pathelement location="build/classes" />
@@ -42,6 +42,10 @@
<fileset dir="${esb.main.lib}" includes="*.jar" />
</path>
+ <path id="classpath">
+ <path refid="base-classpath"/>
+ </path>
+
<path id="test.classpath">
<fileset dir="${esb.root.dir}/../testlib" includes="*.jar" />
</path>
@@ -70,7 +74,7 @@
<jar basedir="build/classes" destfile="build/jbossesb-${ant.project.name}.jar" includes="**/*.class"/>
</target>
- <target name="esb" depends="jar">
+ <target name="esb" depends="jar, service-specific-assemblies">
<copy todir="build/${ant.project.name}.esb/" >
<fileset dir="lib/ext" includes="*.jar"/>
<fileset dir="src/main/resources/" includes="**/*"/>
@@ -78,6 +82,8 @@
</copy>
</target>
+ <target name="service-specific-assemblies"/>
+
<target name="dist" depends="esb">
<!-- copying to jbossesb/lib -->
<mkdir dir="${esb.product.lib.dir}/${ant.project.name}.esb"/>
@@ -109,7 +115,7 @@
</classpath>
</javac>
<copy todir="build/tests/classes" >
- <fileset dir="src/test/java" includes="**/*.xml" />
+ <fileset dir="src/test/java" excludes="**/*.java" />
</copy>
<echo>${basedir}</echo>
<junit printsummary="yes" haltonerror="yes" haltonfailure="yes" showoutput="no" fork="true">
Deleted: labs/jbossesb/trunk/product/services/soap/base-project-build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soap/base-project-build.xml 2009-07-14 14:52:17 UTC (rev 28008)
+++ labs/jbossesb/trunk/product/services/soap/base-project-build.xml 2009-07-14 14:57:55 UTC (rev 28009)
@@ -1,126 +0,0 @@
-<project name="ESB-services-base-build" basedir=".">
- <!--
- WARNING: Your edits maybe overwritten!
-
- Only edit this file in the product/services directory. This
- file is copied down into each services project directory to be
- able to work on each subproject in a selfcontained manner.
-
- If you edit this file, please run the 'copy-buildfiles' target
- from services to copy the new version down to the project directories.
-
- -->
- <dirname property="services.dir" file="${ant.file.base-build}"/>
- <property file="${services.dir}/build.properties"/>
- <property name="esb.root.dir" location="../.."/>
-
- <target name="clean">
- <delete dir="build"/>
- </target>
-
- <target name="prepare" depends="clean">
- <mkdir dir="build/${ant.project.name}.esb/META-INF"/>
- <mkdir dir="build/classes"/>
- </target>
-
- <path id="classpath">
- <path refid="base-classpath" />
- </path>
-
- <path id="base-classpath">
- <pathelement location="build/${ant.project.name}.esb"/>
- <pathelement location="build/classes"/>
- <pathelement location="build/test/classes"/>
- <fileset dir="lib/ext" includes="*.jar"/>
- <fileset dir="lib/ext/build-time" includes="*.jar"/>
- <fileset dir="${esb.product.lib.dir}" includes="*.jar"/>
- <!-- Product Jars. -->
- <pathelement location="src/test/resources"/>
- <fileset dir="../../build/lib" includes="*.jar"/>
- </path>
-
- <path id="test.classpath">
- <fileset dir="${esb.root.dir}/../testlib" includes="*.jar" />
- </path>
-
- <target name="echoCP">
- <property name="cp" refid="classpath"/>
- <echo message="Classpath is ${cp}"/>
- </target>
-
- <target name="check.for.files">
- <fileset id="fs" dir="build/classes"/>
- <condition property="dir_empty">
- <length length="0">
- <fileset refid="fs"/>
- </length>
- </condition>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="src/main/java" destdir="build/classes" debug="on">
- <classpath refid="classpath"/>
- </javac>
- </target>
-
- <target name="jar" depends="compile,check.for.files" unless="dir_empty">
- <jar basedir="build/classes" destfile="build/jbossesb-${ant.project.name}.jar" includes="**/*.class"/>
- </target>
-
- <target name="javadoc">
- <mkdir dir="build/javadoc"/>
- <javadoc destdir="build/javadoc" windowtitle="JBossESB SOAP Service" classpathref="classpath">
- <packageset dir="src/main/java">
- <include name="**/*"/>
- </packageset>
- </javadoc>
- </target>
-
- <target name="esb" depends="jar">
- <copy todir="build/${ant.project.name}.esb/">
- <fileset dir="lib/ext" includes="*.jar"/>
- <fileset dir="src/main/resources/"/>
- <fileset dir="build" includes="*.jar"/>
- <fileset dir="${esb.root.dir}/build/lib"
- includes="jaxws-tools*.jar jaxws-rt*.jar jaxb-xjc*.jar"/>
- </copy>
- </target>
-
- <target name="dist" depends="esb">
- <!-- copying to jbossesb/lib -->
- <mkdir dir="${esb.product.lib.dir}/${ant.project.name}.esb"/>
- <copy todir="${esb.product.lib.dir}/${ant.project.name}.esb">
- <fileset dir="build/${ant.project.name}.esb"/>
- </copy>
- </target>
-
- <target name="base.test" depends="esb">
- <mkdir dir="build/test/classes"/>
- <mkdir dir="build/test/report"/>
- <javac srcdir="src/test/java" destdir="build/test/classes" debug="on">
- <classpath>
- <path refid="classpath" />
- <path refid="test.classpath" />
- </classpath>
- </javac>
- <copy todir="build/test/classes">
- <fileset dir="src/test/java" includes="**/*.xml"/>
- </copy>
- <junit fork="yes" haltonfailure="true" haltonerror="true" showoutput="off">
- <formatter type="plain" usefile="false"/>
- <classpath>
- <path refid="classpath"/>
- <path refid="test.classpath" />
- <pathelement location="src/test/java"/>
- </classpath>
- <sysproperty key="log4j.configuration" value="log4j.xml"/>
- <sysproperty key="jboss.esb.invm.scope.default" value="NONE"/>
- <test name="${testcase}" if="testcase"/>
- <batchtest unless="testcase" todir="build/test/report">
- <fileset dir="build/test/classes" includes="**/*Test.class"/>
- </batchtest>
- </junit>
- </target>
-
-
-</project>
Modified: labs/jbossesb/trunk/product/services/soap/build.properties
===================================================================
--- labs/jbossesb/trunk/product/services/soap/build.properties 2009-07-14 14:52:17 UTC (rev 28008)
+++ labs/jbossesb/trunk/product/services/soap/build.properties 2009-07-14 14:57:55 UTC (rev 28009)
@@ -1 +1,4 @@
-esb.product.lib.dir=../../../product/build/jbossesb/lib
\ No newline at end of file
+esb.product.lib.dir=../../build/jbossesb/lib
+esb.main.lib=../../build/lib
+esb.product.lib.ext=../../lib/ext
+services.base.build=../base-project-build.xml
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/services/soap/build.xml
===================================================================
--- labs/jbossesb/trunk/product/services/soap/build.xml 2009-07-14 14:52:17 UTC (rev 28008)
+++ labs/jbossesb/trunk/product/services/soap/build.xml 2009-07-14 14:57:55 UTC (rev 28009)
@@ -1,7 +1,8 @@
<project name="soap" default="test" basedir=".">
+ <property file="build.properties"/>
<!-- Import the base Ant build script... -->
- <import file="base-project-build.xml"/>
+ <import file="${services.base.build}"/>
<target name="test" depends="base.test"/>
@@ -19,4 +20,10 @@
<pathelement location="../soapui-client/target/classes" />
</path>
+ <target name="service-specific-assemblies" depends="jar">
+ <copy todir="build/${ant.project.name}.esb/">
+ <fileset dir="${esb.root.dir}/build/lib"
+ includes="jaxws-tools*.jar jaxws-rt*.jar jaxb-xjc*.jar"/>
+ </copy>
+ </target>
</project>
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java 2009-07-14 14:52:17 UTC (rev 28008)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/adapter/SOAPProcessorServletContext.java 2009-07-14 14:57:55 UTC (rev 28009)
@@ -161,4 +161,9 @@
{
throw new UnsupportedOperationException("Not yet supported") ;
}
+
+ public String getContextPath()
+ {
+ return "" ;
+ }
}
Modified: labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java
===================================================================
--- labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java 2009-07-14 14:52:17 UTC (rev 28008)
+++ labs/jbossesb/trunk/product/services/soap/src/main/java/org/jboss/soa/esb/actions/soap/wise/SmooksMapper.java 2009-07-14 14:57:55 UTC (rev 28009)
@@ -101,8 +101,11 @@
executionContext.setEventListener(new HtmlReportGenerator(this.getSmooksReport()));
}
org.milyn.container.plugin.PayloadProcessor payloadProcessor = new PayloadProcessor(smooks, org.milyn.container.plugin.ResultType.JAVA);
- Map<String, Object> output = (Map<String, Object>) payloadProcessor.process(originalObjects, executionContext);
- return output;
+ // smooks should return a map
+ // TODO: verify with some unit tests
+ return (Map<String, Object>) payloadProcessor.process(originalObjects, executionContext);
+ // return result.getResultMap();
+
}
public String getSmooksResource() {
More information about the jboss-svn-commits
mailing list