[jboss-svn-commits] JBL Code SVN: r6266 - in labs/jbossesb/workspace/rearchitecture/product: . core core/rosetta core/rosetta/src/org/jboss/internal/soa/esb/addressing core/rosetta/src/org/jboss/internal/soa/esb/message core/rosetta/src/org/jboss/internal/soa/esb/message/format core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml core/rosetta/src/org/jboss/soa/esb/addressing core/rosetta/src/org/jboss/soa/esb/exceptions core/rosetta/src/org/jboss/soa/esb/message core/rosetta/src/org/jboss/soa/esb/message/format core/rosetta/src/org/jboss/soa/esb/notification core/rosetta/src/org/jboss/soa/esb/parameters core/rosetta/tests core/services core/services/src/META-INF docs/samples/TestJBossESB docs/samples/trailblazer/bankloanbrokerdemo docs/samples/trailblazer/bankloanbrokerdemo/IDE/JBossIDE
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Sep 18 09:29:54 EDT 2006
Author: mark.little at jboss.com
Date: 2006-09-18 09:29:41 -0400 (Mon, 18 Sep 2006)
New Revision: 6266
Added:
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/ant.bat
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/build.xml
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/MessageFactoryImpl.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/ContextImpl.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/FaultImpl.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/MessageImpl.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/XMLMessagePlugin.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/exceptions/MarshalException.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/exceptions/ProtocolNotSupportedException.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/exceptions/SendFailedException.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageFactory.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessagePlugin.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/tests/
Removed:
labs/jbossesb/workspace/rearchitecture/product/core/babel/
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/ant.bat
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/build.xml
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/adapters/
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/adapters/
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageFactory.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/tests/
Modified:
labs/jbossesb/workspace/rearchitecture/product/build.xml
labs/jbossesb/workspace/rearchitecture/product/core/build.xml
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/PortReferenceHelper.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/addressing/Call.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/addressing/EPR.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/addressing/XMLUtil.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/exceptions/BaseException.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/Message.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyQueues.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyTopics.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/parameters/ParamRepositoryException.java
labs/jbossesb/workspace/rearchitecture/product/core/rosetta/tests/build.xml
labs/jbossesb/workspace/rearchitecture/product/core/services/build.xml
labs/jbossesb/workspace/rearchitecture/product/core/services/src/META-INF/application.xml
labs/jbossesb/workspace/rearchitecture/product/core/services/src/META-INF/manifest.server
labs/jbossesb/workspace/rearchitecture/product/docs/samples/TestJBossESB/testJBossESB.bat
labs/jbossesb/workspace/rearchitecture/product/docs/samples/TestJBossESB/testJBossESB.sh
labs/jbossesb/workspace/rearchitecture/product/docs/samples/trailblazer/bankloanbrokerdemo/IDE/JBossIDE/.classpath
labs/jbossesb/workspace/rearchitecture/product/docs/samples/trailblazer/bankloanbrokerdemo/build.xml
Log:
changes to make it compile.
Modified: labs/jbossesb/workspace/rearchitecture/product/build.xml
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/build.xml 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/build.xml 2006-09-18 13:29:41 UTC (rev 6266)
@@ -95,7 +95,7 @@
<!-- javadocs paths -->
<path id="org.jboss.esb.javadocs.path">
- <pathelement path="core/common/src"/>
+ <pathelement path="core/rosetta/src"/>
<pathelement path="core/listeners/src"/>
<pathelement path="core/services/src/"/>
</path>
Modified: labs/jbossesb/workspace/rearchitecture/product/core/build.xml
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/build.xml 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/build.xml 2006-09-18 13:29:41 UTC (rev 6266)
@@ -36,7 +36,7 @@
<!-- =================================================================== -->
<target name="org.jboss.esb.core.compile" depends="org.jboss.esb.core.prepare" description="Compile subprojects">
<echo message="Compiling submodules"/>
- <ant dir="common"/>
+ <ant dir="rosetta"/>
<ant dir="services"/>
<ant dir="listeners"/>
</target>
@@ -46,7 +46,7 @@
<!-- =================================================================== -->
<target name="org.jboss.esb.core.test" depends="org.jboss.esb.core.compile" description="Test subprojects">
<echo message="Testing submodules"/>
- <ant dir="common" target="org.jboss.esb.common.test"/>
+ <ant dir="rosetta" target="org.jboss.esb.common.test"/>
<ant dir="listeners" target="org.jboss.esb.listeners.test"/>
<ant dir="services" target="org.jboss.esb.services.test"/>
</target>
@@ -57,7 +57,7 @@
<!-- =================================================================== -->
<target name="jar" depends="org.jboss.esb.core.compile" description="Build jar files">
<echo message="Building jar"/>
- <ant dir="common" target="jar"/>
+ <ant dir="rosetta" target="jar"/>
<ant dir="listeners" target="jar"/>
<ant dir="services" target="jar"/>
<antcall target="-ear"/>
@@ -81,7 +81,7 @@
<delete dir="${coverage.dir}/all" />
<mkdir dir="${coverage.dir}/all" />
<emma>
- <instr instrpath="${classes.dir}/common" destdir="${coverage.dir}/all/instr" metadatafile="${coverage.dir}/all/coverage.emma" />
+ <instr instrpath="${classes.dir}/rosetta" destdir="${coverage.dir}/all/instr" metadatafile="${coverage.dir}/all/coverage.emma" />
</emma>
<emma>
<instr instrpath="${classes.dir}/listeners" destdir="${coverage.dir}/all/instr" metadatafile="${coverage.dir}/all/coverage.emma" />
@@ -92,7 +92,7 @@
<!-- Jar everything, including what disn't get intrumented i.e. interfaces etc... -->
<jar destfile="${org.jboss.esb.internal.dest}/tests/coverage/all/jbossesb-instr-all.jar">
- <fileset dir="${classes.dir}/common"/><fileset dir="${classes.dir}/listeners"/><fileset dir="${classes.dir}/services"/>
+ <fileset dir="${classes.dir}/rosetta"/><fileset dir="${classes.dir}/listeners"/><fileset dir="${classes.dir}/services"/>
<fileset dir="${coverage.dir}/all/instr" />
</jar>
@@ -107,7 +107,7 @@
<fileset dir="${coverage.dir}/all/" >
<include name="*.emma" />
</fileset>
- <sourcepath><dirset dir="./" includes="common/src,listeners/src,services/src" /></sourcepath>
+ <sourcepath><dirset dir="./" includes="rosetta/src,listeners/src,services/src" /></sourcepath>
<html outfile="${coverage.dir}/all/index.html" depth="method" columns="name,line,class,method,block"/>
</report>
</emma>
@@ -119,7 +119,7 @@
<target name="clean" description="Clean dist directory and cleans subprojects">
<delete dir="${org.jboss.esb.internal.dest}/classes"/>
- <ant dir="common" target="clean"/>
+ <ant dir="rosetta" target="clean"/>
<ant dir="listeners" target="clean"/>
<ant dir="services" target="clean"/>
</target>
@@ -128,7 +128,7 @@
<delete dir="${org.jboss.esb.internal.dest}/dist"/>
- <ant dir="common" target="purge"/>
+ <ant dir="rosetta" target="purge"/>
<ant dir="listeners" target="purge"/>
<ant dir="services" target="purge"/>
</target>
Copied: labs/jbossesb/workspace/rearchitecture/product/core/rosetta (from rev 6201, labs/jbossesb/workspace/rearchitecture/product/core/babel)
Deleted: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/ant.bat
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/ant.bat 2006-09-13 16:24:00 UTC (rev 6201)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/ant.bat 2006-09-18 13:29:41 UTC (rev 6266)
@@ -1,12 +0,0 @@
- at echo off
-set ANT_CMD_LINE_ARGS=%1
-if ""%1""=="""" goto doneStart
-shift
-:setupArgs
-if ""%1""=="""" goto doneStart
-set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-:doneStart
-%ANT_HOME%\bin\ant %ANT_CMD_LINE_ARGS%
-
Copied: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/ant.bat (from rev 6265, labs/jbossesb/workspace/rearchitecture/product/core/babel/ant.bat)
Deleted: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/build.xml
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/build.xml 2006-09-13 16:24:00 UTC (rev 6201)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/build.xml 2006-09-18 13:29:41 UTC (rev 6266)
@@ -1,88 +0,0 @@
-<?xml version="1.0"?>
-<project name="BuildJbossEsbCommon" default="org.jboss.esb.common.compile" basedir=".">
-
- <property name="org.jboss.esb.common.jar.name" value="jbossesb-common"/>
- <property name="org.jboss.esb.common.distrib.dir" value="${org.jboss.esb.internal.dest}/dist"/>
- <property name="org.jboss.esb.common.classes.dir" value="${org.jboss.esb.internal.dest}/classes/common"/>
- <property name="org.jboss.esb.common.src.dir" value="${basedir}/src"/>
- <property name="org.jboss.esb.root.dir" value="../.."/>
- <property environment="env"/>
-
- <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
- <property name="org.jboss.esb.ejb3.lib.dir" value="${org.jboss.esb.root.dir}/lib/ejb3"/>
- <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
- <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
- </condition>
-
- <path id="org.jboss.esb.common.base.classpath">
- <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="activation.jar jbossall-client.jar log4j.jar mail.jar"/>
- <fileset dir="${org.jboss.esb.ejb3.lib.dir}" includes="*.jar,*.zip"/>
- </path>
-
- <target name="org.jboss.esb.common.init">
- <tstamp>
- <format property="TODAY" pattern="dd-MM-yy"/>
- </tstamp>
- </target>
-
- <target name="org.jboss.esb.common.prepare" depends="org.jboss.esb.common.init">
- <mkdir dir="${org.jboss.esb.common.classes.dir}"/>
- <mkdir dir="${org.jboss.esb.common.distrib.dir}"/>
- <mkdir dir="${org.jboss.esb.common.distrib.dir}/lib"/>
- </target>
-
- <target name="clean" description="Remove classes directory">
- <delete dir="${org.jboss.esb.common.classes.dir}"/>
- </target>
-
- <target name="purge" depends="clean">
- </target>
-
-
- <target name="org.jboss.esb.common.compile">
- <!-- Compile common -->
- <antcall target="org.jboss.esb.common.internal.compile"/>
- <!-- Compile common tests -->
- <ant inheritAll="true" dir="tests" target="org.jboss.esb.common.tests.compile"/>
- </target>
-
-
- <target name="org.jboss.esb.common.internal.compile" depends="org.jboss.esb.common.prepare"
- description="Compile all classes">
-
- <javac
- destdir="${org.jboss.esb.common.classes.dir}"
- classpathref="org.jboss.esb.common.base.classpath"
- debug="${org.jboss.esb.debug}"
- optimize="${org.jboss.esb.optimize}"
- >
- <src path="${org.jboss.esb.common.src.dir}"/>
- </javac>
-
- </target>
-
- <target name="recompile" depends="clean,org.jboss.esb.common.compile"
- description="Clean and compile"/>
-
- <target name="jar" depends="org.jboss.esb.common.compile" description="Assemble jar files">
- <delete file="${org.jboss.esb.common.distrib.dir}/lib/${org.jboss.esb.common.jar.name}.jar" />
- <jar destfile="${org.jboss.esb.common.distrib.dir}/lib/${org.jboss.esb.common.jar.name}.jar"
- basedir="${org.jboss.esb.common.classes.dir}"
- includes="**/*.class"
- excludes="test/**"
- />
- </target>
-
-
-
- <target name="org.jboss.esb.common.test" description="Run tests for this module">
- <!-- Compile common tests -->
- <ant dir="tests" target="org.jboss.esb.common.internal.test"/>
- </target>
-
-
-
-
- <target name="all" depends="recompile,jar" />
-
-</project>
Copied: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/build.xml (from rev 6265, labs/jbossesb/workspace/rearchitecture/product/core/babel/build.xml)
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/build.xml 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/build.xml 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,88 @@
+<?xml version="1.0"?>
+<project name="BuildJbossEsbRosetta" default="org.jboss.esb.rosetta.compile" basedir=".">
+
+ <property name="org.jboss.esb.rosetta.jar.name" value="jbossesb-rosetta"/>
+ <property name="org.jboss.esb.rosetta.distrib.dir" value="${org.jboss.esb.internal.dest}/dist"/>
+ <property name="org.jboss.esb.rosetta.classes.dir" value="${org.jboss.esb.internal.dest}/classes/rosetta"/>
+ <property name="org.jboss.esb.rosetta.src.dir" value="${basedir}/src"/>
+ <property name="org.jboss.esb.root.dir" value="../.."/>
+ <property environment="env"/>
+
+ <property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
+ <property name="org.jboss.esb.ejb3.lib.dir" value="${org.jboss.esb.root.dir}/lib/ejb3"/>
+ <condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
+ <equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
+ </condition>
+
+ <path id="org.jboss.esb.rosetta.base.classpath">
+ <fileset dir="${org.jboss.esb.ext.lib.dir}" includes="activation.jar jbossall-client.jar log4j.jar mail.jar"/>
+ <fileset dir="${org.jboss.esb.ejb3.lib.dir}" includes="*.jar,*.zip"/>
+ </path>
+
+ <target name="org.jboss.esb.rosetta.init">
+ <tstamp>
+ <format property="TODAY" pattern="dd-MM-yy"/>
+ </tstamp>
+ </target>
+
+ <target name="org.jboss.esb.rosetta.prepare" depends="org.jboss.esb.rosetta.init">
+ <mkdir dir="${org.jboss.esb.rosetta.classes.dir}"/>
+ <mkdir dir="${org.jboss.esb.rosetta.distrib.dir}"/>
+ <mkdir dir="${org.jboss.esb.rosetta.distrib.dir}/lib"/>
+ </target>
+
+ <target name="clean" description="Remove classes directory">
+ <delete dir="${org.jboss.esb.rosetta.classes.dir}"/>
+ </target>
+
+ <target name="purge" depends="clean">
+ </target>
+
+
+ <target name="org.jboss.esb.rosetta.compile">
+ <!-- Compile common -->
+ <antcall target="org.jboss.esb.rosetta.internal.compile"/>
+ <!-- Compile common tests -->
+ <ant inheritAll="true" dir="tests" target="org.jboss.esb.rosetta.tests.compile"/>
+ </target>
+
+
+ <target name="org.jboss.esb.rosetta.internal.compile" depends="org.jboss.esb.rosetta.prepare"
+ description="Compile all classes">
+
+ <javac
+ destdir="${org.jboss.esb.rosetta.classes.dir}"
+ classpathref="org.jboss.esb.rosetta.base.classpath"
+ debug="${org.jboss.esb.debug}"
+ optimize="${org.jboss.esb.optimize}"
+ >
+ <src path="${org.jboss.esb.rosetta.src.dir}"/>
+ </javac>
+
+ </target>
+
+ <target name="recompile" depends="clean,org.jboss.esb.rosetta.compile"
+ description="Clean and compile"/>
+
+ <target name="jar" depends="org.jboss.esb.rosetta.compile" description="Assemble jar files">
+ <delete file="${org.jboss.esb.rosetta.distrib.dir}/lib/${org.jboss.esb.rosetta.jar.name}.jar" />
+ <jar destfile="${org.jboss.esb.rosetta.distrib.dir}/lib/${org.jboss.esb.rosetta.jar.name}.jar"
+ basedir="${org.jboss.esb.rosetta.classes.dir}"
+ includes="**/*.class"
+ excludes="test/**"
+ />
+ </target>
+
+
+
+ <target name="org.jboss.esb.rosetta.test" description="Run tests for this module">
+ <!-- Compile common tests -->
+ <ant dir="tests" target="org.jboss.esb.rosetta.internal.test"/>
+ </target>
+
+
+
+
+ <target name="all" depends="recompile,jar" />
+
+</project>
Copied: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src (from rev 6265, labs/jbossesb/workspace/rearchitecture/product/core/babel/src)
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/PortReferenceHelper.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/internal/soa/esb/addressing/PortReferenceHelper.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/addressing/PortReferenceHelper.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -39,10 +39,10 @@
import org.w3c.dom.NodeList;
import org.w3c.dom.Text;
-import org.jboss.soa.esbcore.addressing.PortReference;
-import org.jboss.soa.esbcore.addressing.XMLUtil;
-import org.jboss.soa.esbcore.addressing.PortReference.Extension;
-import org.jboss.soa.esbcore.exceptions.MarshalException;
+import org.jboss.soa.esb.addressing.PortReference;
+import org.jboss.soa.esb.addressing.XMLUtil;
+import org.jboss.soa.esb.addressing.PortReference.Extension;
+import org.jboss.soa.esb.exceptions.MarshalException;
/*
* This should pack the PortReference into an ERP.
Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/MessageFactoryImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/internal/soa/esb/message/format/MessageFactoryImpl.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/MessageFactoryImpl.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,82 @@
+package org.jboss.internal.soa.esb.message.format;
+
+import org.jboss.soa.esb.message.Message;
+import org.jboss.soa.esb.message.format.MessageFactory;
+import org.jboss.soa.esb.message.format.MessageType;
+
+import org.jboss.internal.soa.esb.message.format.xml.XMLMessagePlugin;
+
+import java.net.URI;
+import java.security.InvalidParameterException;
+import java.util.Hashtable;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+/**
+ * Messages may contain attachments that do not appear in the main payload body.
+ * For example, binary document formats, zip files etc.
+ *
+ * @author Mark Little
+ */
+
+public class MessageFactoryImpl extends MessageFactory
+{
+
+ public MessageFactoryImpl ()
+ {
+ /*
+ * Go through the properties loaded from the property file.
+ * Anything starting with MessagePlugin.MESSAGE_PLUGIN is assumed to be
+ * a plugin that we load and add to the list.
+ */
+
+ /*
+ * Now add the default(s).
+ */
+
+ messageFormats.put(new XMLMessagePlugin(), MessageType.JBOSS_XML);
+ }
+
+ public Message getMessage () // returns some default implementation.
+ {
+ return (Message) messageFormats.get(MessageType.DEFAULT_TYPE);
+ }
+
+ public Message getMessage (URI type) // returns a message of a specific type.
+ {
+ if (type == null)
+ throw new InvalidParameterException();
+
+ return (Message) messageFormats.get(type);
+ }
+
+ public Message getMessage (Message msg, URI type) // convert a message from one form to another.
+ {
+ if ((msg == null) || (type == null))
+ throw new InvalidParameterException();
+
+ return null;
+ }
+
+ private final Hashtable messageFormats = new Hashtable();
+
+}
Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/AttachmentImpl.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,51 @@
+package org.jboss.internal.soa.esb.message.format.xml;
+
+import org.jboss.soa.esb.message.Attachment;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+/**
+ * Messages may contain attachments that do not appear in the main payload body.
+ * For example, binary document formats, zip files etc.
+ *
+ * @author Mark Little
+ */
+
+public class AttachmentImpl implements Attachment
+{
+ public Element toXML (Document doc, Element envelope)
+ {
+ Element attachmentElement = doc.createElement("attachment");
+
+ envelope.appendChild(attachmentElement);
+
+ return attachmentElement;
+ }
+
+ public void fromXML (Element envelope)
+ {
+ }
+
+}
Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/BodyImpl.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,118 @@
+package org.jboss.internal.soa.esb.message.format.xml;
+
+import java.security.InvalidParameterException;
+
+import org.jboss.soa.esb.message.Body;
+
+import org.w3c.dom.CDATASection;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+/*
+ * Placeholder class. Just enough to do the initial POC.
+ */
+
+public class BodyImpl implements Body
+{
+ public BodyImpl ()
+ {
+ _content = null;
+ }
+
+ public Element toXML (Document doc, Element envelope)
+ {
+ Element bodyElement = doc.createElement("body");
+
+ envelope.appendChild(bodyElement);
+
+ bodyElement.appendChild(doc.createCDATASection(new String(_content)));
+
+ return bodyElement;
+ }
+
+ public void fromXML (Element envelope)
+ {
+ NodeList nl = envelope.getChildNodes();
+
+ for (int i = 0; i < nl.getLength(); i++)
+ {
+ if (nl.item(i).getNodeName().equals("body"))
+ {
+ CDATASection cdata = (CDATASection) nl.item(i).getFirstChild();
+
+ _content = cdata.getWholeText().getBytes();
+
+ break;
+ }
+ }
+ }
+
+ public void setContents (byte[] content)
+ {
+ _content = content;
+ }
+
+ public byte[] getContents ()
+ {
+ return _content;
+ }
+
+ public void replace (Body b)
+ {
+ if (b == null)
+ throw new InvalidParameterException();
+
+ setContents(b.getContents());
+ }
+
+ public void merge (Body b)
+ {
+ if (b == null)
+ throw new InvalidParameterException();
+
+ byte[] toAdd = b.getContents();
+
+ if ((toAdd != null) && (toAdd.length > 0))
+ {
+ if ((_content == null) || (_content.length == 0))
+ {
+ _content = toAdd;
+ }
+ else
+ {
+ int newSize = _content.length + toAdd.length;
+ byte[] buffer = new byte[newSize];
+
+ for (int i = 0; i < _content.length; i++)
+ buffer[i] = _content[i];
+
+ for (int j = 0; j < toAdd.length; j++)
+ buffer[_content.length+j] = toAdd[j];
+ }
+ }
+ }
+
+ private byte[] _content;
+}
\ No newline at end of file
Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/ContextImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/internal/soa/esb/message/format/xml/ContextImpl.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/ContextImpl.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,43 @@
+package org.jboss.internal.soa.esb.message.format.xml;
+
+import org.jboss.soa.esb.message.Context;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+public class ContextImpl implements Context
+{
+ public Element toXML (Document doc, Element envelope)
+ {
+ Element contextElement = doc.createElement("context");
+
+ envelope.appendChild(contextElement);
+
+ return contextElement;
+ }
+
+ public void fromXML (Element envelope)
+ {
+ }
+}
\ No newline at end of file
Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/FaultImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/internal/soa/esb/message/format/xml/FaultImpl.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/FaultImpl.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,44 @@
+package org.jboss.internal.soa.esb.message.format.xml;
+
+import org.jboss.soa.esb.message.Fault;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+public class FaultImpl implements Fault
+{
+ public Element toXML (Document doc, Element envelope)
+ {
+ Element faultElement = doc.createElement("fault");
+
+ envelope.appendChild(faultElement);
+
+ return faultElement;
+ }
+
+ public void fromXML (Element envelope)
+ {
+ }
+
+}
\ No newline at end of file
Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/HeaderImpl.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,91 @@
+package org.jboss.internal.soa.esb.message.format.xml;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+import org.jboss.soa.esb.message.Header;
+import org.jboss.soa.esb.addressing.Call;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * The message header. Contains such things as routing information.
+ */
+
+public class HeaderImpl implements Header
+{
+ public HeaderImpl ()
+ {
+ _call = null;
+ }
+
+ // TODO add other setters/getters for artibitrary attributes
+
+ public Call getCall ()
+ {
+ return _call;
+ }
+
+ public void setCall (Call call)
+ {
+ _call = call;
+ }
+
+ public Element toXML (Document doc, Element envelope)
+ {
+ // TODO remove MAGIC strings!!
+
+ Element headerElement = doc.createElement("header");
+
+ envelope.appendChild(headerElement);
+
+ return _call.toXML(doc, headerElement);
+ }
+
+ public void fromXML (Element envelope)
+ {
+ _call = new Call();
+
+ NodeList nl = envelope.getChildNodes();
+ Element headerElement = null;
+
+ for (int i = 0; i < nl.getLength(); i++)
+ {
+ Node n = nl.item(i);
+
+ if (n.getNodeName().equals("header"))
+ {
+ headerElement = (Element) n;
+ break;
+ }
+ }
+
+ // TODO error handling!!
+
+ if (headerElement != null)
+ _call.fromXML(headerElement);
+ }
+
+ private Call _call;
+}
\ No newline at end of file
Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/MessageImpl.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/internal/soa/esb/message/format/xml/MessageImpl.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/MessageImpl.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,177 @@
+package org.jboss.internal.soa.esb.message.format.xml;
+
+import org.jboss.soa.esb.message.*;
+import org.jboss.soa.esb.message.format.MessageType;
+
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import java.net.URI;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+/**
+ * This is the basic internal core message abstraction. A message consists of the following
+ * components:
+ *
+ * Header: the header information contains information such as the destination EPR, the
+ * sender EPR, where the reply goes etc, i.e., general message-level functional information.
+ * Context: additional information to contextualise the message; for example, transaction or
+ * security data, the identity of the ultimate receiver, or HTTP-cookie like information.
+ * Body: the actual payload of the message.
+ * Fault: any fault information associated with the message.
+ * Attachment: any attachments associated with the message.
+ *
+ * Each message, once created, has a corresponding element for these 5 components. That element
+ * may be empty (<b>NOT NULL</b>). The object representing the element can then be used to act
+ * on the corresponding data item in the message.
+ *
+ * @author Mark Little
+ *
+ */
+
+public class MessageImpl implements Message
+{
+ /**
+ * @return get the header component of the message.
+ */
+
+ public Header getHeader ()
+ {
+ return _theHeader;
+ }
+
+ /**
+ * @return get the context component of the message.
+ */
+
+ public Context getContext ()
+ {
+ return _theContext;
+ }
+
+ /**
+ * @return get the body component of the message.
+ */
+
+ public Body getBody ()
+ {
+ return _theBody;
+ }
+
+ /**
+ * @return get any faults associated with the message. These should not
+ * be application level faults, but comms level.
+ */
+
+ public Fault getFault ()
+ {
+ return _theFault;
+ }
+
+ /**
+ * @return get any message attachments.
+ */
+
+ public Attachment getAttachment ()
+ {
+ return _theAttachment;
+ }
+
+ /**
+ * @return the type of this message format.
+ */
+
+ public URI getType ()
+ {
+ return MessageType.JBOSS_XML;
+ }
+
+ // to/from XML here, rather than on individual elements
+
+ public Document toXML (Document doc)
+ {
+ try
+ {
+ // TODO remove magic strings!
+
+ Element envelope = doc.createElement("envelope");
+
+ doc.appendChild(envelope);
+
+ _theHeader.toXML(doc, envelope);
+ _theContext.toXML(doc, envelope);
+ _theBody.toXML(doc, envelope);
+ _theFault.toXML(doc, envelope);
+ _theAttachment.toXML(doc, envelope);
+
+ return doc;
+ }
+ catch (Exception ex)
+ {
+ // TODO error handling
+
+ ex.printStackTrace();
+
+ return null;
+ }
+ }
+
+ public void fromXML (Document doc)
+ {
+ try
+ {
+ NodeList nl = doc.getChildNodes();
+ Element envelope = null;
+
+ for (int i = 0; i < nl.getLength(); i++)
+ {
+ Node n = nl.item(i);
+
+ if (n.getNodeName().equals("envelope"))
+ {
+ envelope = (Element) n;
+ break;
+ }
+ }
+
+ _theHeader.fromXML(envelope);
+ _theContext.fromXML(envelope);
+ _theBody.fromXML(envelope);
+ _theFault.fromXML(envelope);
+ _theAttachment.fromXML(envelope);
+ }
+ catch (Exception ex)
+ {
+ ex.printStackTrace();
+ }
+ }
+
+ private HeaderImpl _theHeader = new HeaderImpl();
+ private ContextImpl _theContext = new ContextImpl();
+ private BodyImpl _theBody = new BodyImpl();
+ private FaultImpl _theFault = new FaultImpl();
+ private AttachmentImpl _theAttachment = new AttachmentImpl();
+
+}
Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/XMLMessagePlugin.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/internal/soa/esb/message/format/xml/XMLMessagePlugin.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/internal/soa/esb/message/format/xml/XMLMessagePlugin.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,49 @@
+package org.jboss.internal.soa.esb.message.format.xml;
+
+import org.jboss.soa.esb.message.Message;
+
+import org.jboss.soa.esb.message.format.MessagePlugin;
+import org.jboss.soa.esb.message.format.MessageType;
+
+import java.net.URI;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+/**
+ * Used to plug in new message formats dynamically.
+ *
+ * @author Mark Little
+ *
+ */
+
+public class XMLMessagePlugin implements MessagePlugin
+{
+ public Message getMessage ()
+ {
+ return new MessageImpl();
+ }
+
+ public URI getType ()
+ {
+ return MessageType.JBOSS_XML;
+ }
+}
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/addressing/Call.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/addressing/Call.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/addressing/Call.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -22,14 +22,17 @@
*/
import org.jboss.soa.esb.addressing.PortReference.Extension;
-import org.jboss.soa.internal.esbcore.addressing.PortReferenceHelper;
+import org.jboss.internal.soa.esb.addressing.PortReferenceHelper;
+
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
- * This class represents the endpoint reference for services.
+ * A call represents an exchange pattern for this message. It is built up as the message
+ * flows through the ESB and identifies where the message should go, along with any
+ * routing information for faults, replies etc.
*/
import java.net.URI;
@@ -43,7 +46,7 @@
_action = _messageID = null;
}
- public EPR (EPR epr)
+ public Call (EPR epr)
{
_to = epr;
@@ -76,12 +79,12 @@
_replyTo = replyTo;
}
- public PortReference getReplyTo () throws URISyntaxException
+ public EPR getReplyTo () throws URISyntaxException
{
return _replyTo;
}
- public void setFaultTo (PortReference uri)
+ public void setFaultTo (EPR uri)
{
_faultTo = uri;
}
@@ -121,9 +124,9 @@
return _messageID;
}
- public void copy (EPR from)
+ public void copy (Call from)
{
- EPR fromImpl = (EPR) from;
+ Call fromImpl = (Call) from;
_to = fromImpl._to;
_from = fromImpl._from;
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/addressing/EPR.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/addressing/EPR.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/addressing/EPR.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -21,12 +21,6 @@
* @author mark.little at jboss.com
*/
-import org.jboss.soa.esb.addressing.PortReference.Extension;
-import org.jboss.soa.internal.esbcore.addressing.PortReferenceHelper;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
/**
* This class represents the endpoint reference for services.
@@ -39,9 +33,14 @@
{
public EPR ()
{
- _to = new PortReference();
+ _addr = new PortReference();
}
+ public EPR (PortReference addr)
+ {
+ _addr = addr;
+ }
+
public EPR (URI uri)
{
_addr = new PortReference(uri.toString());
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/addressing/XMLUtil.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/addressing/XMLUtil.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/addressing/XMLUtil.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -47,6 +47,15 @@
public static final String RELATES_TO_TAG = "RelatesTo";
public static final String FAULT_TO_TAG = "FaultTo";
+ // WS-ARJADDR
+
+ public static final String WSARJADDR_PREFIX = "wsarjaddr";
+ public static final String WSARJADDR_NAMESPACE_URI = "http://schemas.arjuna.com/ws/2004/06/wsarjaddr";
+
+ public static final String INSTANCE_IDENTIFIER_TAG = "InstanceIdentifier";
+
+ public static final String UNKNOWNERROR_ERROR_CODE = "UnknownError";
+
// XML Namespace
public static final String XMLNS_URI = "http://www.w3.org/2000/xmlns/" ;
public static final String XMLNS_PREFIX = "xmlns:" ;
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/exceptions/BaseException.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/exceptions/BaseException.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/exceptions/BaseException.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -1,4 +1,4 @@
-package jboss.soa.esb.exceptions;
+package org.jboss.soa.esb.exceptions;
/**
* Base ESB Exception.
Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/exceptions/MarshalException.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/exceptions/MarshalException.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/exceptions/MarshalException.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,36 @@
+package org.jboss.soa.esb.exceptions;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+import java.lang.Exception;
+
+public class MarshalException extends Exception {
+
+ public MarshalException () {
+ super();
+ }
+
+ public MarshalException (String s) {
+ super(s);
+ }
+
+}
Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/exceptions/ProtocolNotSupportedException.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/exceptions/ProtocolNotSupportedException.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/exceptions/ProtocolNotSupportedException.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,36 @@
+package org.jboss.soa.esb.exceptions;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+import java.lang.Exception;
+
+public class ProtocolNotSupportedException extends Exception {
+
+ public ProtocolNotSupportedException () {
+ super();
+ }
+
+ public ProtocolNotSupportedException (String s) {
+ super(s);
+ }
+
+}
Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/exceptions/SendFailedException.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/exceptions/SendFailedException.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/exceptions/SendFailedException.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,47 @@
+package org.jboss.soa.esb.exceptions;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+import java.lang.Exception;
+
+public class SendFailedException extends Exception {
+
+ public SendFailedException () {
+ super();
+ }
+
+ public SendFailedException (String s) {
+ super(s);
+ }
+
+ public SendFailedException (Exception ex)
+ {
+ _nestedException = ex;
+ }
+
+ public Exception getNestedException ()
+ {
+ return _nestedException;
+ }
+
+ private Exception _nestedException;
+}
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/Message.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/message/Message.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/Message.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -21,6 +21,8 @@
* @author mark.little at jboss.com
*/
+import java.net.URI;
+
/**
* This is the basic internal core message abstraction. A message consists of the following
* components:
@@ -74,4 +76,10 @@
public Attachment getAttachment ();
+ /**
+ * @return the type of this message.
+ */
+
+ public URI getType ();
+
}
Copied: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format (from rev 6218, labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/message/adapters)
Deleted: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageFactory.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/message/adapters/MessageFactory.java 2006-09-14 12:39:01 UTC (rev 6218)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageFactory.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -1,48 +0,0 @@
-package org.jboss.soa.esb.message.adapters;
-
-import org.jboss.internal.soa.esb.message.adapters.MessageFactoryImpl;
-
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author mark.little at jboss.com
- */
-
-/**
- * You get a message of a specific type when you need it. Obviously that type may not be
- * suitable for the service (hopefully you've got that contractual information a priori, but
- * maybe not) and in which case some translation/transformation may be necessary.
- *
- * @author Mark Little
- *
- */
-
-public abstract class MessageFactory
-{
- Message getMessage (); // returns some default implementation.
- Message getMessage (int type); // returns a message of a specific type.
- Message getMessage (Message msg, int type); // convert a message from one form to another.
-
- public static MessageFactory getInstance ()
- {
- return theFactory;
- }
-
- private static final theFactory = new MessageFactoryImpl();
-
-}
Copied: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageFactory.java (from rev 6265, labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/message/adapters/MessageFactory.java)
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/message/adapters/MessageFactory.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageFactory.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,52 @@
+package org.jboss.soa.esb.message.format;
+
+import org.jboss.soa.esb.message.Message;
+
+import org.jboss.internal.soa.esb.message.format.MessageFactoryImpl;
+
+import java.net.URI;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+/**
+ * You get a message of a specific type when you need it. Obviously that type may not be
+ * suitable for the service (hopefully you've got that contractual information a priori, but
+ * maybe not) and in which case some translation/transformation may be necessary.
+ *
+ * @author Mark Little
+ *
+ */
+
+public abstract class MessageFactory
+{
+ public abstract Message getMessage (); // returns some default implementation.
+ public abstract Message getMessage (URI type); // returns a message of a specific type.
+ public abstract Message getMessage (Message msg, URI type); // convert a message from one form to another.
+
+ public static MessageFactory getInstance ()
+ {
+ return theFactory;
+ }
+
+ private static final MessageFactory theFactory = new MessageFactoryImpl();
+
+}
Added: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessagePlugin.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/message/adapters/MessagePlugin.java 2006-09-14 12:39:01 UTC (rev 6218)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessagePlugin.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,41 @@
+package org.jboss.soa.esb.message.format;
+
+import org.jboss.soa.esb.message.Message;
+
+import java.net.URI;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+/**
+ * Used to plug in new message formats dynamically.
+ *
+ * @author Mark Little
+ *
+ */
+
+public interface MessagePlugin
+{
+ public static final String MESSAGE_PLUGIN = "org.jboss.soa.esb.message.format.plugin";
+
+ public Message getMessage ();
+ public URI getType ();
+}
Deleted: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/message/adapters/MessageType.java 2006-09-14 12:39:01 UTC (rev 6218)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -1,41 +0,0 @@
-package org.jboss.soa.esb.message.adapters;
-
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2006, JBoss Inc., and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- *
- * (C) 2005-2006,
- * @author mark.little at jboss.com
- */
-
-/**
- * You get a message of a specific type when you need it. Obviously that type may not be
- * suitable for the service (hopefully you've got that contractual information a priori, but
- * maybe not) and in which case some translation/transformation may be necessary.
- *
- * @author Mark Little
- *
- */
-
-public interface MessageType
-{
- /*
- * DO NOT reorder this list. New types may be added as required.
- */
-
- public static final int JBOSS_XML = 0;
- public static final int JAVA_SERIALIZED = 1;
-}
Copied: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java (from rev 6265, labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/message/adapters/MessageType.java)
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/message/adapters/MessageType.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/message/format/MessageType.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -0,0 +1,62 @@
+package org.jboss.soa.esb.message.format;
+
+import java.net.URI;
+
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ *
+ * (C) 2005-2006,
+ * @author mark.little at jboss.com
+ */
+
+/**
+ * You get a message of a specific type when you need it. Obviously that type may not be
+ * suitable for the service (hopefully you've got that contractual information a priori, but
+ * maybe not) and in which case some translation/transformation may be necessary.
+ *
+ * @author Mark Little
+ *
+ */
+
+public abstract class MessageType
+{
+ /*
+ * DO NOT reorder this list. New types may be added as required.
+ */
+
+ public static URI JBOSS_XML = null;
+ public static URI JAVA_SERIALIZED = null;
+
+ public static URI DEFAULT_TYPE = null;
+
+ static
+ {
+ try
+ {
+ JBOSS_XML = new URI("urn:jboss:esb:message:type:JBOSS_XML");
+ JAVA_SERIALIZED = new URI("urn:jboss:esb:message:type:JAVA_SERIALIZED");
+
+ DEFAULT_TYPE = JBOSS_XML;
+ }
+ catch (Exception ex)
+ {
+ throw new ExceptionInInitializerError(ex.toString());
+ }
+
+ }
+
+}
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/notification/NotifyJMS.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyJMS.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -50,7 +50,7 @@
* @param p_oMsg
* Message
*/
- protected abstract void sendToAll(Normalized p_oMsg);
+ protected abstract void sendToAll(Message p_oMsg);
/**
* Element name mnemonic to search for child elements in the DomElement at
@@ -161,7 +161,7 @@
* @see NotifyJMS#CHILD_MSG_PROP
*/
public void sendNotification(Serializable p_o) throws Exception {
- Normalized oMsg = null;
+ Message oMsg = null;
if (p_o instanceof String) {
oMsg = m_oSess.createTextMessage(p_o.toString());
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyQueues.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/notification/NotifyQueues.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyQueues.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -91,7 +91,7 @@
return (QueueConnectionFactory) m_oCtx.lookup(CONNECTION_FACTORY);
}
- protected void sendToAll(Normalized p_oMsg) {
+ protected void sendToAll(Message p_oMsg) {
for (int i1 = 0; i1 < m_oaMssProd.length; i1++) {
QueueSender oCurr = (QueueSender) m_oaMssProd[i1];
try {
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyTopics.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/notification/NotifyTopics.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/notification/NotifyTopics.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -59,7 +59,7 @@
} // __________________________________
- protected void sendToAll(Normalized p_oMsg) {
+ protected void sendToAll(Message p_oMsg) {
for (int i1 = 0; i1 < m_oaMssProd.length; i1++) {
TopicPublisher oCurr = (TopicPublisher) m_oaMssProd[i1];
try {
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/parameters/ParamRepositoryException.java
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/src/org/jboss/soa/esb/parameters/ParamRepositoryException.java 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/src/org/jboss/soa/esb/parameters/ParamRepositoryException.java 2006-09-18 13:29:41 UTC (rev 6266)
@@ -1,6 +1,6 @@
package org.jboss.soa.esb.parameters;
-import org.jboss.soa.esb.BaseException;
+import org.jboss.soa.esb.exceptions.BaseException;
/**
* {@link org.jboss.soa.esb.parameters.ParamRepository} access Exception.
Copied: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/tests (from rev 6265, labs/jbossesb/workspace/rearchitecture/product/core/babel/tests)
Modified: labs/jbossesb/workspace/rearchitecture/product/core/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/babel/tests/build.xml 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/rosetta/tests/build.xml 2006-09-18 13:29:41 UTC (rev 6266)
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<project name="build.common.tests" default="org.jboss.esb.common.tests.compile" basedir=".">
+<project name="build.common.tests" default="org.jboss.esb.rosetta.tests.compile" basedir=".">
<property name="org.jboss.esb.internal.dest" value="${basedir}/../../../build"/>
<property name="org.jboss.esb.module.src.dir" value="../src"/>
@@ -48,7 +48,7 @@
<delete dir="${org.jboss.esb.tests.classes.dir}"/>
</target>
- <target name="org.jboss.esb.common.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
+ <target name="org.jboss.esb.rosetta.tests.compile" if="org.jboss.esb.buildtests" depends="org.jboss.esb.tests.init">
<javac
destdir="${org.jboss.esb.tests.classes.dir}"
Modified: labs/jbossesb/workspace/rearchitecture/product/core/services/build.xml
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/services/build.xml 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/services/build.xml 2006-09-18 13:29:41 UTC (rev 6266)
@@ -125,7 +125,7 @@
<ear destfile="${org.jboss.esb.services.dist.dir}/lib/jbossesb-appl.ear"
appxml="${org.jboss.esb.services.metainf.dir}/application.xml">
<fileset dir="${org.jboss.esb.services.dist.dir}"
- includes="jbossesb-common.jar
+ includes="jbossesb-rosetta.jar
,CQ3ServicesClient.jar
,CQ3Services.jar
"/>
Modified: labs/jbossesb/workspace/rearchitecture/product/core/services/src/META-INF/application.xml
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/services/src/META-INF/application.xml 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/services/src/META-INF/application.xml 2006-09-18 13:29:41 UTC (rev 6266)
@@ -12,6 +12,6 @@
<java>jbossesb-listeners.jar</java>
</module>
<module>
- <java>jbossesb-common.jar</java>
+ <java>jbossesb-rosetta.jar</java>
</module>
</application>
\ No newline at end of file
Modified: labs/jbossesb/workspace/rearchitecture/product/core/services/src/META-INF/manifest.server
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/core/services/src/META-INF/manifest.server 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/core/services/src/META-INF/manifest.server 2006-09-18 13:29:41 UTC (rev 6266)
@@ -1,3 +1,3 @@
Manifest-Version: 1.0
-Class-Path: jbossesb-common.jar jbossesb-services-client.jar
+Class-Path: jbossesb-rosetta.jar jbossesb-services-client.jar
Modified: labs/jbossesb/workspace/rearchitecture/product/docs/samples/TestJBossESB/testJBossESB.bat
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/docs/samples/TestJBossESB/testJBossESB.bat 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/docs/samples/TestJBossESB/testJBossESB.bat 2006-09-18 13:29:41 UTC (rev 6266)
@@ -1,5 +1,5 @@
SET ESB_HOME=c:\dev\JBossESB
SET JBOSS_HOME=C:\java-tools\jboss4-ejb3
-java -cp %ESB_HOME%/product/build/dist/lib/jbossesb-services.jar;%ESB_HOME%/product/build/dist/lib/jbossesb-common.jar;%ESB_HOME%/product/build/dist/lib/jbossesb-listeners.jar;%JBOSS_HOME%/client/jbossall-client.jar;%JBOSS_HOME%/client/log4j.jar;%JBOSS_HOME%/client/jboss-aspect-jdk50-client.jar;%JBOSS_HOME%/client/jboss-aop-jdk50-client.jar;%JBOSS_HOME%/client/jboss-ejb3-client.jar;. org.jboss.soa.esb.listeners.GpListener paramsDir/FileMoverConfigExample.xml
+java -cp %ESB_HOME%/product/build/dist/lib/jbossesb-services.jar;%ESB_HOME%/product/build/dist/lib/jbossesb-rosetta.jar;%ESB_HOME%/product/build/dist/lib/jbossesb-listeners.jar;%JBOSS_HOME%/client/jbossall-client.jar;%JBOSS_HOME%/client/log4j.jar;%JBOSS_HOME%/client/jboss-aspect-jdk50-client.jar;%JBOSS_HOME%/client/jboss-aop-jdk50-client.jar;%JBOSS_HOME%/client/jboss-ejb3-client.jar;. org.jboss.soa.esb.listeners.GpListener paramsDir/FileMoverConfigExample.xml
Modified: labs/jbossesb/workspace/rearchitecture/product/docs/samples/TestJBossESB/testJBossESB.sh
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/docs/samples/TestJBossESB/testJBossESB.sh 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/docs/samples/TestJBossESB/testJBossESB.sh 2006-09-18 13:29:41 UTC (rev 6266)
@@ -13,4 +13,4 @@
export PATH
-java -classpath $ESB_HOME/lib/jbossesb-services.jar:$ESB_HOME/lib/jbossesb-common.jar:$ESB_HOME/lib/jbossesb-listeners.jar:$JBOSS_HOME/client/jbossall-client.jar:$JBOSS_HOME/client/log4j.jar:$JBOSS_HOME/client/jboss-aspect-jdk50-client.jar:$JBOSS_HOME/client/jboss-aop-jdk50-client.jar:$JBOSS_HOME/client/jboss-ejb3-client.jar:. org.jboss.soa.esb.listeners.GpListener /paramsDir/FileMoverConfigExampleJason.xml
+java -classpath $ESB_HOME/lib/jbossesb-services.jar:$ESB_HOME/lib/jbossesb-rosetta.jar:$ESB_HOME/lib/jbossesb-listeners.jar:$JBOSS_HOME/client/jbossall-client.jar:$JBOSS_HOME/client/log4j.jar:$JBOSS_HOME/client/jboss-aspect-jdk50-client.jar:$JBOSS_HOME/client/jboss-aop-jdk50-client.jar:$JBOSS_HOME/client/jboss-ejb3-client.jar:. org.jboss.soa.esb.listeners.GpListener /paramsDir/FileMoverConfigExampleJason.xml
Modified: labs/jbossesb/workspace/rearchitecture/product/docs/samples/trailblazer/bankloanbrokerdemo/IDE/JBossIDE/.classpath
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/docs/samples/trailblazer/bankloanbrokerdemo/IDE/JBossIDE/.classpath 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/docs/samples/trailblazer/bankloanbrokerdemo/IDE/JBossIDE/.classpath 2006-09-18 13:29:41 UTC (rev 6266)
@@ -19,7 +19,7 @@
<classpathentry kind="var" path="JBOSS_HOME/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aop-jdk50.jar"/>
<classpathentry kind="var" path="JBOSS_HOME/server/default/deploy/jboss-aop-jdk50.deployer/jboss-aspect-library-jdk50.jar"/>
<classpathentry kind="var" path="JBOSS_HOME/server/default/deploy/jboss-aop-jdk50.deployer/trove.jar"/>
- <classpathentry kind="var" path="ESB_HOME/jbossesb-common.jar"/>
+ <classpathentry kind="var" path="ESB_HOME/jbossesb-rosetta.jar"/>
<classpathentry kind="var" path="ESB_HOME/jbossesb-listeners.jar"/>
<classpathentry kind="var" path="ESB_HOME/jbossesb-processors.jar"/>
<classpathentry kind="var" path="ESB_HOME/jbossesb-services.jar"/>
Modified: labs/jbossesb/workspace/rearchitecture/product/docs/samples/trailblazer/bankloanbrokerdemo/build.xml
===================================================================
--- labs/jbossesb/workspace/rearchitecture/product/docs/samples/trailblazer/bankloanbrokerdemo/build.xml 2006-09-18 13:05:18 UTC (rev 6265)
+++ labs/jbossesb/workspace/rearchitecture/product/docs/samples/trailblazer/bankloanbrokerdemo/build.xml 2006-09-18 13:29:41 UTC (rev 6266)
@@ -22,7 +22,7 @@
<fileset dir="${org.jboss.soa.esb.samples.loanbroker.jboss_home}/server/default/deploy/jboss-aop-jdk50.deployer/"
includes="jboss-aop-jdk50.jar jboss-aspect-library-jdk50.jar jboss-aop-jdk50.deployer/trove.jar"/>
<fileset dir="${org.jboss.soa.esb.samples.loanbroker.esb_home}/product/build/dist/lib"
- includes="jbossesb-common.jar jbossesb-listeners.jar jbossesb-processors.jar jbossesb-services.jar"/>
+ includes="jbossesb-rosetta.jar jbossesb-listeners.jar jbossesb-processors.jar jbossesb-services.jar"/>
</path>
<path id="org.jboss.esb.samples.loanbroker.testclasspath">
<fileset dir="${org.jboss.esb.samples.loanbroker.lib.ext.dir}" includes="*.jar"/>
@@ -33,7 +33,7 @@
<fileset dir="${org.jboss.soa.esb.samples.loanbroker.jboss_home}/server/default/deploy/jboss-aop-jdk50.deployer/"
includes="jboss-aop-jdk50.jar jboss-aspect-library-jdk50.jar jboss-aop-jdk50.deployer/trove.jar"/>
<fileset dir="${org.jboss.soa.esb.samples.loanbroker.esb_home}/product/build/dist/lib"
- includes="jbossesb-common.jar jbossesb-listeners.jar jbossesb-processors.jar jbossesb-services.jar"/>
+ includes="jbossesb-rosetta.jar jbossesb-listeners.jar jbossesb-processors.jar jbossesb-services.jar"/>
<pathelement location="${org.jboss.esb.samples.loanbroker.classes.dir}"/>
</path>
More information about the jboss-svn-commits
mailing list