[jboss-svn-commits] JBL Code SVN: r6479 - in labs/jbossesb/trunk: IDE/JBossIDE product product/core product/core/listeners product/core/listeners/tests product/core/rosetta product/core/rosetta/src/org/jboss/soa/esb product/core/rosetta/tests product/core/services product/core/services/src/META-INF product/core/services/tests product/etc/schemas/xml product/etc/schemas/xml/common product/lib/ext
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sat Sep 30 16:41:32 EDT 2006
Author: mark.little at jboss.com
Date: 2006-09-30 16:41:16 -0400 (Sat, 30 Sep 2006)
New Revision: 6479
Added:
labs/jbossesb/trunk/product/core/rosetta/
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/MarshalException.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/ProtocolNotSupportedException.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/SendFailedException.java
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/addressing/
labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/message/
labs/jbossesb/trunk/product/etc/schemas/xml/common/email.xsd
labs/jbossesb/trunk/product/etc/schemas/xml/common/ftp.xsd
labs/jbossesb/trunk/product/etc/schemas/xml/common/jdbc.xsd
labs/jbossesb/trunk/product/etc/schemas/xml/email-epr.xsd
labs/jbossesb/trunk/product/etc/schemas/xml/ftp-epr.xsd
labs/jbossesb/trunk/product/etc/schemas/xml/jdbc-epr.xsd
labs/jbossesb/trunk/product/lib/ext/Base64.html
Removed:
labs/jbossesb/trunk/product/core/common/
Modified:
labs/jbossesb/trunk/IDE/JBossIDE/.classpath
labs/jbossesb/trunk/product/build.xml
labs/jbossesb/trunk/product/core/build.xml
labs/jbossesb/trunk/product/core/listeners/build.xml
labs/jbossesb/trunk/product/core/listeners/tests/build.xml
labs/jbossesb/trunk/product/core/rosetta/build.xml
labs/jbossesb/trunk/product/core/rosetta/tests/build.xml
labs/jbossesb/trunk/product/core/services/build.xml
labs/jbossesb/trunk/product/core/services/src/META-INF/application.xml
labs/jbossesb/trunk/product/core/services/src/META-INF/manifest.server
labs/jbossesb/trunk/product/core/services/tests/build.xml
labs/jbossesb/trunk/product/etc/schemas/xml/common/common.xsd
labs/jbossesb/trunk/product/etc/schemas/xml/common/jms.xsd
labs/jbossesb/trunk/product/etc/schemas/xml/jms-epr.xsd
Log:
Merge of reachitecture branch with trunk: adding in EPR and Message format support.
Modified: labs/jbossesb/trunk/IDE/JBossIDE/.classpath
===================================================================
--- labs/jbossesb/trunk/IDE/JBossIDE/.classpath 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/IDE/JBossIDE/.classpath 2006-09-30 20:41:16 UTC (rev 6479)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="product/core/common/src"/>
- <classpathentry kind="src" path="product/core/common/tests/src"/>
+ <classpathentry kind="src" path="product/core/rosetta/src"/>
+ <classpathentry kind="src" path="product/core/rosetta/tests/src"/>
<classpathentry kind="src" path="product/core/listeners/src"/>
<classpathentry kind="src" path="product/core/listeners/tests/src"/>
<classpathentry kind="src" path="product/core/services/src"/>
@@ -20,6 +20,6 @@
<classpathentry kind="lib" path="product/lib/ejb3_embedded/jboss-ejb3-all.jar"/>
<classpathentry kind="lib" path="product/lib/ejb3_embedded/thirdparty-all.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="product/core/common/tests/resources/conf"/>
+ <classpathentry kind="lib" path="product/core/rosetta/tests/resources/conf"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: labs/jbossesb/trunk/product/build.xml
===================================================================
--- labs/jbossesb/trunk/product/build.xml 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/build.xml 2006-09-30 20:41:16 UTC (rev 6479)
@@ -1,4 +1,4 @@
-<project name="JBESB" default="org.jboss.esb.compile" basedir=".">
+<project name="JBESB" default="test" basedir=".">
<!-- class path behaviour -->
<property name="build.sysclasspath" value="last"/>
Modified: labs/jbossesb/trunk/product/core/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/build.xml 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/core/build.xml 2006-09-30 20:41:16 UTC (rev 6479)
@@ -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.rosetta.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>
Modified: labs/jbossesb/trunk/product/core/listeners/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/build.xml 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/core/listeners/build.xml 2006-09-30 20:41:16 UTC (rev 6479)
@@ -21,7 +21,7 @@
<path id="org.jboss.esb.listeners.default.classpath">
<path refid="org.jboss.esb.listeners.base.classpath"/>
<pathelement location="${org.jboss.esb.classes.dir}"/>
- <pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/services"/>
<fileset dir="${org.jboss.esb.ejb3.lib.dir}" includes="*.jar,*.zip"/>
</path>
Modified: labs/jbossesb/trunk/product/core/listeners/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/core/listeners/tests/build.xml 2006-09-30 20:41:16 UTC (rev 6479)
@@ -24,7 +24,7 @@
<fileset dir="../${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
<fileset dir="../${org.jboss.esb.deploy.lib.dir}" includes="*.jar"/>
- <pathelement location="${org.jboss.esb.module.classes.root.dir}/common"/>
+ <pathelement location="${org.jboss.esb.module.classes.root.dir}/rosetta"/>
<pathelement location="${org.jboss.esb.module.classes.root.dir}/services"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
<pathelement location="${org.jboss.esb.module.tests.conf.dir}"/>
Copied: labs/jbossesb/trunk/product/core/rosetta (from rev 6473, labs/jbossesb/trunk/product/core/common)
Modified: labs/jbossesb/trunk/product/core/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/common/build.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/jbossesb/trunk/product/core/rosetta/build.xml 2006-09-30 20:41:16 UTC (rev 6479)
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
-<project name="BuildJbossEsbCommon" default="org.jboss.esb.common.compile" basedir=".">
+<project name="BuildJbossEsbRosetta" default="org.jboss.esb.rosetta.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.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"/>
@@ -14,60 +14,60 @@
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
- <path id="org.jboss.esb.common.base.classpath">
+ <path id="org.jboss.esb.rosetta.base.classpath">
<fileset dir="${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
<fileset dir="${org.jboss.esb.ejb3.lib.dir}" includes="*.jar,*.zip"/>
</path>
- <target name="org.jboss.esb.common.init">
+ <target name="org.jboss.esb.rosetta.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 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.common.classes.dir}"/>
+ <delete dir="${org.jboss.esb.rosetta.classes.dir}"/>
</target>
<target name="purge" depends="clean">
</target>
- <target name="org.jboss.esb.common.compile">
+ <target name="org.jboss.esb.rosetta.compile">
<!-- Compile common -->
- <antcall target="org.jboss.esb.common.internal.compile"/>
+ <antcall target="org.jboss.esb.rosetta.internal.compile"/>
<!-- Compile common tests -->
- <ant inheritAll="true" dir="tests" target="org.jboss.esb.common.tests.compile"/>
+ <ant inheritAll="true" dir="tests" target="org.jboss.esb.rosetta.tests.compile"/>
</target>
- <target name="org.jboss.esb.common.internal.compile" depends="org.jboss.esb.common.prepare"
+ <target name="org.jboss.esb.rosetta.internal.compile" depends="org.jboss.esb.rosetta.prepare"
description="Compile all classes">
<javac
- destdir="${org.jboss.esb.common.classes.dir}"
- classpathref="org.jboss.esb.common.base.classpath"
+ 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.common.src.dir}"/>
+ <src path="${org.jboss.esb.rosetta.src.dir}"/>
</javac>
</target>
- <target name="recompile" depends="clean,org.jboss.esb.common.compile"
+ <target name="recompile" depends="clean,org.jboss.esb.rosetta.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}"
+ <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/**"
/>
@@ -75,9 +75,9 @@
- <target name="org.jboss.esb.common.test" description="Run tests for this module">
+ <target name="org.jboss.esb.rosetta.test" description="Run tests for this module">
<!-- Compile common tests -->
- <ant dir="tests" target="org.jboss.esb.common.internal.test"/>
+ <ant dir="tests" target="org.jboss.esb.rosetta.internal.test"/>
</target>
Added: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/MarshalException.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/MarshalException.java 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/MarshalException.java 2006-09-30 20:41:16 UTC (rev 6479)
@@ -0,0 +1,40 @@
+package org.jboss.soa.esb;
+
+/*
+ * 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 static final long serialVersionUID = 0xE;
+
+ public MarshalException()
+ {
+ super();
+ }
+
+ public MarshalException(String s)
+ {
+ super(s);
+ }
+
+}
Added: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/ProtocolNotSupportedException.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/ProtocolNotSupportedException.java 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/ProtocolNotSupportedException.java 2006-09-30 20:41:16 UTC (rev 6479)
@@ -0,0 +1,40 @@
+package org.jboss.soa.esb;
+
+/*
+ * 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 static final long serialVersionUID = 0xE;
+
+ public ProtocolNotSupportedException()
+ {
+ super();
+ }
+
+ public ProtocolNotSupportedException(String s)
+ {
+ super(s);
+ }
+
+}
Added: labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/SendFailedException.java
===================================================================
--- labs/jbossesb/trunk/product/core/common/src/org/jboss/soa/esb/SendFailedException.java 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/jbossesb/trunk/product/core/rosetta/src/org/jboss/soa/esb/SendFailedException.java 2006-09-30 20:41:16 UTC (rev 6479)
@@ -0,0 +1,51 @@
+package org.jboss.soa.esb;
+
+/*
+ * 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 static final long serialVersionUID = 0xE;
+
+ 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/trunk/product/core/rosetta/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/common/tests/build.xml 2006-09-29 18:35:39 UTC (rev 6473)
+++ labs/jbossesb/trunk/product/core/rosetta/tests/build.xml 2006-09-30 20:41:16 UTC (rev 6479)
@@ -1,14 +1,14 @@
<?xml version="1.0"?>
-<project name="build.common.tests" default="org.jboss.esb.common.tests.compile" basedir=".">
+<project name="build.rosetta.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"/>
- <property name="org.jboss.esb.module.classes.dir" value="${org.jboss.esb.internal.dest}/classes/common"/>
+ <property name="org.jboss.esb.module.classes.dir" value="${org.jboss.esb.internal.dest}/classes/rosetta"/>
<property name="org.jboss.esb.module.tests.src.dir" value="${basedir}/src"/>
<property name="org.jboss.esb.tests.classes.dir" value="${org.jboss.esb.internal.dest}/tests"/>
<property name="org.jboss.esb.tests.report.dir" value="${org.jboss.esb.internal.dest}/tests/junit"/>
<property name="org.jboss.esb.root.dir" value="../.."/>
- <property name="org.jboss.esb.module.tests.coverage.dir" value="${org.jboss.esb.internal.dest}/tests/coverage/common"/>
+ <property name="org.jboss.esb.module.tests.coverage.dir" value="${org.jboss.esb.internal.dest}/tests/coverage/rosetta"/>
<property name="org.jboss.esb.module.classes.instr.dir" value="${org.jboss.esb.module.tests.coverage.dir}/instr" />
<property environment="env"/>
<property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ejb3_embedded"/>
@@ -19,7 +19,7 @@
<property name="org.jboss.esb.deployment.properties" value="../../../config/deployment.properties"/>
<!-- Load deployment properties File -->
<property file="${org.jboss.esb.deployment.properties}"/>
- <property name="org.jboss.esb.ejb3_conf.tests.src.dir" value="${org.jboss.esb.root.dir}/common/tests/resources/conf"/>
+ <property name="org.jboss.esb.ejb3_conf.tests.src.dir" value="${org.jboss.esb.root.dir}/rosetta/tests/resources/conf"/>
<condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
@@ -29,7 +29,7 @@
<fileset dir="../${org.jboss.esb.ext.lib.dir}" includes="*.jar"/>
<fileset dir="../${org.jboss.esb.deploy.lib.dir}" includes="*.jar"/>
- <pathelement location="${org.jboss.esb.root.dir}/common/tests/resources/etc"/>
+ <pathelement location="${org.jboss.esb.root.dir}/rosetta/tests/resources/etc"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
<pathelement location="${org.jboss.esb.ejb3_conf.tests.src.dir}"/>
<fileset dir="${org.jboss.esb.ejb3_embedded.lib.dir}" includes="jboss-ejb3-all.jar hibernate-all.jar thirdparty-all.jar"/>
@@ -50,7 +50,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}"
@@ -66,7 +66,7 @@
<!-- ====================================================================== -->
<!-- T E S T -->
<!-- ====================================================================== -->
- <target name="org.jboss.esb.common.internal.test">
+ <target name="org.jboss.esb.rosetta.internal.test">
<!-- Instrument the code for code coverage - using emma... -->
<delete dir="${org.jboss.esb.module.tests.coverage.dir}" />
<mkdir dir="${org.jboss.esb.module.classes.instr.dir}" />
Modified: labs/jbossesb/trunk/product/core/services/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/build.xml 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/core/services/build.xml 2006-09-30 20:41:16 UTC (rev 6479)
@@ -100,7 +100,7 @@
<path id="org.jboss.esb.services.default.classpath">
<path refid="org.jboss.esb.services.base.classpath"/>
- <pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
<pathelement location="${org.jboss.esb.internal.dest}/classes/listeners"/>
</path>
@@ -123,7 +123,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/trunk/product/core/services/src/META-INF/application.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/META-INF/application.xml 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/core/services/src/META-INF/application.xml 2006-09-30 20:41:16 UTC (rev 6479)
@@ -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/trunk/product/core/services/src/META-INF/manifest.server
===================================================================
--- labs/jbossesb/trunk/product/core/services/src/META-INF/manifest.server 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/core/services/src/META-INF/manifest.server 2006-09-30 20:41:16 UTC (rev 6479)
@@ -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/trunk/product/core/services/tests/build.xml
===================================================================
--- labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/core/services/tests/build.xml 2006-09-30 20:41:16 UTC (rev 6479)
@@ -16,7 +16,7 @@
<property name="org.jboss.esb.ext.lib.dir" value="${org.jboss.esb.root.dir}/lib/ext"/>
<property name="org.jboss.esb.ejb3_embedded.lib.dir" value="${org.jboss.esb.root.dir}/../lib/ejb3_embedded"/>
- <property name="org.jboss.esb.ejb3_conf.tests.src.dir" value="${org.jboss.esb.root.dir}/common/tests/resources/conf"/>
+ <property name="org.jboss.esb.ejb3_conf.tests.src.dir" value="${org.jboss.esb.root.dir}/rosetta/tests/resources/conf"/>
<condition property="org.jboss.esb.ext.lib.dir" value="{org.jboss.esb.jboss.home}/client">
<equals arg1="${org.jboss.esb.frominstall}" arg2="yes"/>
</condition>
@@ -25,14 +25,14 @@
<fileset dir="../${org.jboss.esb.ext.lib.dir}"
includes="*.jar" excludes="jbossall-client.jar"/>
<pathelement location="${org.jboss.esb.module.classes.dir}"/>
- <pathelement location="${org.jboss.esb.internal.dest}/classes/common"/>
+ <pathelement location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
<pathelement location="${org.jboss.esb.ejb3_conf.tests.src.dir}"/>
<fileset dir="${org.jboss.esb.ejb3_embedded.lib.dir}" includes="*.jar"/>
</path>
<target name="org.jboss.esb.tests.init">
<tstamp>
- <format property="TODAY" pattern="d-MM-yy"/>
+ <format property="TODAY" pattern="dd-MM-yy"/>
</tstamp>
<mkdir dir="${org.jboss.esb.tests.classes.dir}"/>
Modified: labs/jbossesb/trunk/product/etc/schemas/xml/common/common.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/common/common.xsd 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/common/common.xsd 2006-09-30 20:41:16 UTC (rev 6479)
@@ -23,7 +23,7 @@
<enumeration value="ftp"/>
<enumeration value="email"/>
<enumeration value="xmpp"/>
- </restriction>
+ </restriction>
</simpleType>
<simpleType name="gateway-type">
<restriction base="string">
Added: labs/jbossesb/trunk/product/etc/schemas/xml/common/email.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/common/email.xsd 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/common/email.xsd 2006-09-30 20:41:16 UTC (rev 6479)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:common="http://www.jboss.org/soa/endpoint/common"
+ xmlns:email="http://www.jboss.org/soa/endpoint/protocol/email"
+ targetNamespace="http://www.jboss.org/soa/endpoint/protocol/email" elementFormDefault="unqualified"
+ attributeFormDefault="unqualified">
+ <annotation>
+ <documentation>
+ JBoss Inc JMS SOA Schema Definition Copyright 2006
+ </documentation>
+ </annotation>
+
+ <!-- import common -->
+ <import namespace="http://www.jboss.org/soa/endpoint/common" schemaLocation="common.xsd"/>
+ <element name="email">
+ <complexType>
+ <sequence>
+ <!-- Core -->
+ <element name="service-name" type="common:service-name"/>
+ <element name="service-type" type="common:service-type"/>
+ <element name="gateway-type" type="common:gateway-type"/>
+ <!-- email related -->
+ <element name="protocol" type="email:protocol"/>
+ <element name="host" type="email:host"/>
+ <element name="port" type="email:port"/>
+ <element name="username" type="email:username"/>
+ <element name="password" type="email:password"/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <!-- Email Specific Definitions -->
+ <simpleType name="protocol">
+ <restriction base="string">
+ <enumeration value="smtp"/>
+ <enumeration value="pop"/>
+ </restriction>
+ </simpleType>
+
+
+ <simpleType name="host">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+
+ <simpleType name="port">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="5"/>
+ </restriction>
+ </simpleType>
+
+
+ <simpleType name="username">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+
+ <simpleType name="password">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+
+</schema>
\ No newline at end of file
Added: labs/jbossesb/trunk/product/etc/schemas/xml/common/ftp.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/common/ftp.xsd 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/common/ftp.xsd 2006-09-30 20:41:16 UTC (rev 6479)
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:common="http://www.jboss.org/soa/endpoint/common"
+ xmlns:ftp="http://www.jboss.org/soa/endpoint/protocol/ftp"
+ targetNamespace="http://www.jboss.org/soa/endpoint/protocol/ftp" elementFormDefault="unqualified"
+ attributeFormDefault="unqualified">
+ <annotation>
+ <documentation>
+ JBoss Inc JMS SOA Schema Definition Copyright 2006
+ </documentation>
+ </annotation>
+
+ <!-- import common -->
+ <import namespace="http://www.jboss.org/soa/endpoint/common" schemaLocation="common.xsd"/>
+ <element name="ftp">
+ <complexType>
+ <sequence>
+ <!-- Core -->
+ <element name="service-name" type="common:service-name"/>
+ <element name="service-type" type="common:service-type"/>
+ <element name="gateway-type" type="common:gateway-type"/>
+ <!-- ftp related -->
+ <element name="host" type="ftp:host"/>
+ <element name="port" type="ftp:port"/>
+ <element name="username" type="ftp:username"/>
+ <element name="password" type="ftp:password"/>
+ <element name="directory" type="ftp:directory"/>
+
+ </sequence>
+ </complexType>
+ </element>
+
+ <!-- FTP Specific Definitions -->
+ <simpleType name="host">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+
+ <simpleType name="port">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="5"/>
+ </restriction>
+ </simpleType>
+
+
+ <simpleType name="username">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+
+ <simpleType name="password">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+ <simpleType name="directory">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+
+</schema>
\ No newline at end of file
Added: labs/jbossesb/trunk/product/etc/schemas/xml/common/jdbc.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/common/jdbc.xsd 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/common/jdbc.xsd 2006-09-30 20:41:16 UTC (rev 6479)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+ xmlns:common="http://www.jboss.org/soa/endpoint/common"
+ xmlns:jdbc="http://www.jboss.org/soa/endpoint/protocol/jdbc"
+ targetNamespace="http://www.jboss.org/soa/endpoint/protocol/jdbc" elementFormDefault="unqualified"
+ attributeFormDefault="unqualified">
+ <annotation>
+ <documentation>
+ JBoss Inc JMS SOA Schema Definition Copyright 2006
+ </documentation>
+ </annotation>
+
+ <!-- import common -->
+ <import namespace="http://www.jboss.org/soa/endpoint/common" schemaLocation="common.xsd"/>
+ <element name="jdbc">
+ <complexType>
+ <sequence>
+ <!-- Core -->
+ <element name="service-name" type="common:service-name"/>
+ <element name="service-type" type="common:service-type"/>
+ <element name="gateway-type" type="common:gateway-type"/>
+ <!-- jdbc related -->
+ <element name="url" type="jdbc:url"/>
+ <element name="driver" type="jdbc:driver"/>
+ <element name="username" type="jdbc:username"/>
+ <element name="password" type="jdbc:password"/>
+ <element name="sql" type="jdbc:sql"/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <!-- JDBC Specific Definitions -->
+ <simpleType name="url">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+
+ <simpleType name="driver">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+ <simpleType name="username">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+
+ <simpleType name="password">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="20"/>
+ </restriction>
+ </simpleType>
+
+ <simpleType name="sql">
+ <restriction base="string">
+ <minLength value="1"/>
+ <maxLength value="100"/>
+ </restriction>
+ </simpleType>
+
+</schema>
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/etc/schemas/xml/common/jms.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/common/jms.xsd 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/common/jms.xsd 2006-09-30 20:41:16 UTC (rev 6479)
@@ -11,18 +11,24 @@
<!-- import common -->
<import namespace="http://www.jboss.org/soa/endpoint/common" schemaLocation="common.xsd" />
-
- <complexType name="jms">
+ <element name="jms">
+ <complexType>
<sequence>
- <element name="service-name" type="common:service-name"/>
+ <!-- Core -->
+ <element name="service-name" type="common:service-name"/>
<element name="service-type" type="common:service-type"/>
<element name="gateway-type" type="common:gateway-type" />
- <element name="connection-factory" type="string"/>
- <element name="destination-name" type="string"/>
- </sequence>
- </complexType>
-
- <simpleType name="specification-version">
+ <!-- jms related -->
+ <element name="spec-version" type="jms:specification-version" />
+ <element name="destination-type" type="jms:destination-type" />
+ <element name="destination-name" type="string"/>
+ <element name="connection-factory" type="string"/>
+ </sequence>
+ </complexType>
+ </element>
+
+ <!-- JMS Specific Definitions -->
+ <simpleType name="specification-version">
<restriction base="string">
<enumeration value="1.1"/>
<enumeration value="1.0.2b"/>
@@ -35,5 +41,7 @@
<enumeration value="topic"/>
</restriction>
</simpleType>
-
+
+
+
</schema>
\ No newline at end of file
Added: labs/jbossesb/trunk/product/etc/schemas/xml/email-epr.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/email-epr.xsd 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/email-epr.xsd 2006-09-30 20:41:16 UTC (rev 6479)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:email="http://www.jboss.org/soa/endpoint/protocol/email" targetNamespace="http://www.jboss.org/soa/endpoint/email-epr" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="common/ws-addr.xsd"/>
+ <import namespace="http://www.jboss.org/soa/endpoint/protocol/email" schemaLocation="common/email.xsd"/>
+ <element name="email-epr">
+ <complexType>
+ <sequence>
+ <element ref="wsa:EndpointReference"/>
+ <element ref="email:email"/>
+ </sequence>
+ <attribute name="version" type="string" use="required"/>
+ </complexType>
+ </element>
+</schema>
\ No newline at end of file
Added: labs/jbossesb/trunk/product/etc/schemas/xml/ftp-epr.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/ftp-epr.xsd 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/ftp-epr.xsd 2006-09-30 20:41:16 UTC (rev 6479)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:ftp="http://www.jboss.org/soa/endpoint/protocol/ftp" targetNamespace="http://www.jboss.org/soa/endpoint/ftp-epr" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="common/ws-addr.xsd"/>
+ <import namespace="http://www.jboss.org/soa/endpoint/protocol/ftp" schemaLocation="common/ftp.xsd"/>
+ <element name="ftp-epr">
+ <complexType>
+ <sequence>
+ <element ref="wsa:EndpointReference"/>
+ <element ref="ftp:ftp"/>
+ </sequence>
+ <attribute name="version" type="string" use="required"/>
+ </complexType>
+ </element>
+</schema>
\ No newline at end of file
Added: labs/jbossesb/trunk/product/etc/schemas/xml/jdbc-epr.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/jdbc-epr.xsd 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jdbc-epr.xsd 2006-09-30 20:41:16 UTC (rev 6479)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:jdbc="http://www.jboss.org/soa/endpoint/protocol/jdbc" targetNamespace="http://www.jboss.org/soa/endpoint/jdbc-epr" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="common/ws-addr.xsd"/>
+ <import namespace="http://www.jboss.org/soa/endpoint/protocol/jdbc" schemaLocation="common/jdbc.xsd"/>
+ <element name="jdbc-epr">
+ <complexType>
+ <sequence>
+ <element ref="wsa:EndpointReference"/>
+ <element ref="jdbc:jdbc"/>
+ </sequence>
+ <attribute name="version" type="string" use="required"/>
+ </complexType>
+ </element>
+</schema>
\ No newline at end of file
Modified: labs/jbossesb/trunk/product/etc/schemas/xml/jms-epr.xsd
===================================================================
--- labs/jbossesb/trunk/product/etc/schemas/xml/jms-epr.xsd 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/etc/schemas/xml/jms-epr.xsd 2006-09-30 20:41:16 UTC (rev 6479)
@@ -1,44 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!-- This is the first cut at defining a standard jms-eps for jboss soa, what is happening here is
- the assembling of xsds into our jms epr destination.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:jms-epr="http://www.jboss.org/soa/endpoint/jms-epr" xmlns:wsa="http://www.w3.org/2005/08/addressing"
-xmlns:jms="http://www.jboss.org/soa/endpoint/protocol/jms" targetNamespace="http://www.jboss.org/soa/endpoint/jms-epr" elementFormDefault="qualified">
-
- <import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="common/ws-addr.xsd"/>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:wsa="http://www.w3.org/2005/08/addressing" xmlns:jms="http://www.jboss.org/soa/endpoint/protocol/jms" targetNamespace="http://www.jboss.org/soa/endpoint/jms-epr" elementFormDefault="qualified" attributeFormDefault="unqualified">
+ <import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="common/ws-addr.xsd"/>
<import namespace="http://www.jboss.org/soa/endpoint/protocol/jms" schemaLocation="common/jms.xsd"/>
- <complexType name="jms-epr">
- <sequence>
- <element name="epr" type="wsa:EndpointReferenceType"/>
- <element name="jms" type="jms:jms/>
- </sequence>
- </complexType>
-
-
- <!--
- NOTE:
- The next set of stuff here is purely to provoke thoughts about defining these aspects and their
- configuration etc. But if the general feeling is this should not be here, it can be deleted.
- -->
- <!--
- Plugins (aka interceptors?) Would the dispatcher send requests through the plugins? And would they
- be configured for each endpoint instance?
- <xs:include namespace="http://www.jboss.org/soa/endpoint/plugin" schemaLocation="common/plugin.xsd"/>
- -->
- <!--
- Contract defintions? We 'may' want this here. Mark? Unless this is delegated to the dispatcher layer, but
- what if we include the dispatching defintions here/interceptors - I'm guessing you may not like this..
-<xs:include namespace="http://www.jboss.org/soa/endpoint/contract" schemaLocation="common/contract.xsd"/>
- -->
- <!--
- We can define a dispatcher(s) configuration which may also encompass routing, this is now relevant to
- what ever task is assigned. If the dispatcher layer is forced to process the message before dumping it
- on the bus? In this case could we say that the dispatchers.xsd contains/imports routing based information ?
-<xs:include namespace="http://www.jboss.org/soa/endpoint/dispatcher" schemaLocation="common/dispatcher.xsd"/>
- -->
- <!--
- Ok I know routing was briefly discussed on the transformation thread, this can be deleted. The point
- is to combine thoughts to a common definition.
-<xs:include namespace="http://www.jboss.org/soa/endpoint/routing" schemaLocation="common/routing.xsd"/>
- -->
+ <element name="jms-epr">
+ <complexType>
+ <sequence>
+ <element ref="wsa:EndpointReference"/>
+ <element ref="jms:jms"/>
+ </sequence>
+ <attribute name="version" type="string" use="required"/>
+ </complexType>
+ </element>
</schema>
+
Added: labs/jbossesb/trunk/product/lib/ext/Base64.html
===================================================================
--- labs/jbossesb/trunk/product/lib/ext/Base64.html 2006-09-30 17:45:12 UTC (rev 6478)
+++ labs/jbossesb/trunk/product/lib/ext/Base64.html 2006-09-30 20:41:16 UTC (rev 6479)
@@ -0,0 +1,397 @@
+<html>
+ <head>
+<!-- Generated from XML source. Copyright 2001 Robert Harder. -->
+ <title>Base64 - A Public Domain Base64 Encoder/Decoder for Java</title>
+ <meta http-equiv="Content-Type" content="text/html;CHARSET=iso-8859-1"/>
+ <meta http-equiv="Content-Language" content="EN"/>
+ <meta name="keywords" content="base64, base, 64, java, public domain"/>
+ <meta name="description" content="Base64 - A Public Domain Base64 Encoder/Decoder for Java"/>
+ <meta name="abstract" content="Base64 - A Public Domain Base64 Encoder/Decoder for Java"/>
+ <meta name="author" content="Robert Harder"/>
+ <meta name="copyright" content="Robert Harder, 2004"/>
+ <meta name="distribution" content="Global"/>
+ <meta name="revisit-after" content="7 days"/>
+ <meta name="robots" content="FOLLOW,INDEX"/>
+ <link rel="ICON" href="./favicon.ico" type="image/x-icon"/>
+ <link rel="SHORTCUT ICON" href="./favicon.ico"/>
+ <base target="_parent"/>
+ <style type="text/css">
+<!--
+
+
+body { margin: 0; }
+.iHarderNet { font-family: arial, geneva, lucida sans unicode, helvetica; color: white; text-align: center; font-size: 14pt; }
+.i_iHarder { font-family: times new roman, courier; font-style: italic; font-weight: bold; font-size: 12pt; }
+
+ .MainTitle
+ { color: white;
+ font-family: arial, geneva, lucida sans unicode, helvetica;
+ text-align: center;
+ font-weight: bold;
+ font-size: 24pt;
+ font-style: italic;
+ margin-bottom: 4pt;
+ }
+
+ .OpenTS_Home
+ { color: white;
+ font-family: arial, geneva, lucida sans unicode, helvetica;
+ text-align: center;
+ font-weight: bold;
+ font-size: 14pt;
+ font-style: italic;
+ }
+
+
+ .Menu
+ { margin-top: 10pt;
+ margin-left: 6pt;
+ text-indent: -6pt;
+ font-family: arial, geneva, lucida sans unicode, helvetica;
+ font-weight: bold;
+ font-size: 10pt;
+ }
+
+ .SubMenu
+ { margin-top: -5pt;
+ margin-left: 4pt;
+ }
+
+
+ .MenuItem
+ { margin-top: 10pt;
+ font-family: arial, geneva, lucida sans unicode, helvetica;
+ font-weight: bold;
+ font-size: 10pt;
+ }
+
+ .Menu A
+ { color: #000033;
+ }
+
+ .Logo
+ { text-align: center;
+ }
+
+.SubTitle
+{ font-family: Arial, san serif;
+ font-size: 16pt;
+ font-style: italic;
+ font-weight: bold;
+}
+
+
+ .SectionTitle
+ { margin-top: 1em;
+ margin-left: 1em;
+ margin-right: 50%;
+ font-family: arial, geneva, lucida sans unicode, helvetica;
+ font-weight: bold;
+ font-size: larger;
+ /*border-top: 4px double black;*/
+ border-bottom: 4px double black;
+ }
+
+ .MainSectionTitle
+ { margin-top: 1em;
+ font-family: arial, geneva, lucida sans unicode, helvetica;
+ font-weight: bold;
+ font-size: 22pt;
+ font-style: italic;
+ border-bottom: 4px double black;
+ }
+
+ .SectionBody
+ { margin-top: 1em;
+ }
+
+ .MainSectionBody
+ { margin-top: 10pt;
+ }
+
+ .MainPage
+ { margin: 4pt;
+ margin-right: 24pt;
+ }
+
+ .FAQList_Question
+ {
+ font-family: arial, geneva, lucida sans unicode, helvetica;
+ font-weight: bold;
+ }
+
+ .FAQ_Question
+ {
+ font-family: arial, geneva, lucida sans unicode, helvetica;
+ font-weight: bold;
+ }
+
+ .FAQ_Answer
+ {
+ }
+
+
+ .TopMenu
+ { margin-top: 20pt;
+ margin-bottom: 10pt;
+ border-bottom: 4px black;
+ text-align: center
+ }
+
+ .BottomMenu
+ { margin-top: 0.1in;
+ border-top: 4px double black;
+ margin-bottom: 10pt;
+ border-bottom: 4px black;
+ text-align: center
+ }
+
+ p
+ {
+ margin-top: 0.1in;
+ text-indent: 1em;
+ }
+
+ li
+ { margin-top: 0.2in;
+ }
+
+ ul
+ { margin-left: 0.25in;
+ margin-top: 0.1in;
+ }
+
+ tt
+ { font-size: larger;
+ }
+
+ a
+ { color: #000055;
+ }
+ a:hover
+ { background: lavender;
+ text-decoration: none;
+ color: black;
+ }
+
+ p.alert { border-left:solid red 6px; margin-left:-12px; padding-left:6px; }
+ pre { padding:1ex; border: solid gray 1px;}
+ code { font-size: 95%; }
+ dl dt { font-weight: bold }
+ dl dd { margin-bottom: 1em }
+ .newCode { background: #EEEEEE; }
+
+
+ -->
+ </style>
+ </head>
+ <body bgcolor="white">
+ <table width="100%" height="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr bgcolor="#000066" height="50">
+ <td width="128" height="50">
+ <div class="iHarderNet">
+ <a href="http://www.iHarder.net">
+ <span class="iHarderNet"><span class="i_iHarder">i</span>Harder.net</span>
+ </a>
+ </div>
+ </td>
+ <td width="*">
+ <div class="MainTitle">
+ <title-medium>Base64</title-medium>
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <div style="margin:0 ; border-top: 1px double black"/>
+ </td>
+ </tr>
+ <tr height="*">
+ <td width="128" valign="top" bgcolor="#9090d0">
+ <table width="100%" height="100%" cellpadding="2" cellspacing="0" border="0">
+ <tr height="1">
+ <td height="1" width="120" bgcolor="white" valign="center" align="center">
+ <div class="SubTitle">
+ Base64
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td valign="top" height="*" style="border-top: solid black 1px; border-right: solid black 1px">
+ <div class="Menu">
+ <a title="" href="./.">Home</a>
+ </div>
+ <div class="Menu">
+ <a title="A Java framework for the Tabu Search meta-heuristic" href="http://OpenTS.iHarder.net">OpenTS</a>
+ </div>
+ <div class="Menu">
+ <a title="Software and tutorials for programming Mac OS X" href="./macosx">Mac OS X</a>
+ </div>
+ <div class="Menu">
+ <a title="Xmlize (like serialize) your Java objects into XML documents." href="./xmlizable">Xmlizable</a>
+ </div>
+ <div class="Menu">
+ <a title="Public Domain Base64 Java utility." href="./base64">Base64</a>
+ </div>
+ <div class="Menu">
+ <a title="Drag and drop files into your Java programs" href="./filedrop">FileDrop</a>
+ </div>
+ <div class="Menu">
+ <a title="View Mr. Harder's online resume" href="http://resume.iharder.net">Mr. Harder's Resume</a>
+ </div>
+ <div class="Menu">
+ <a title="Send email to Mr. Harder" href="mailto:robertharder[nospam]gmail.com">Contact Mr. Harder</a>
+ </div>
+ <p>
+ <hr align="center"/>
+ </p>
+ <div align="center" style="text-align:center">
+ <a href="http://sourceforge.net">
+ <img src="http://sourceforge.net/sflogo.php?group_id=23200" width="88" height="31" border="0" alt="SourceForge Logo"/>
+ </a>
+ </div>
+ <p/>
+ <div align="center" style="text-align:center">
+ <a href="http://iharder.sourceforge.net/gotmoney.php">
+ <img src="http://iharder.sourceforge.net/gotmoney.gif" width="88" height="32" border="0" alt="got money?"/>
+ </a>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </td>
+ <td width="*" height="*" bgcolor="white" valign="top">
+ <div class="MainPage">
+
+ <div class="MainSectionTitle">Summary</div><div class="MainSectionBody">
+
+<P><em>Now supports GZip-(de)compressing data before/after encoding!</em></P>
+
+ <P>
+ This is a <strong>Public Domain</strong> Java class providing
+ <strong>very fast</strong> Base64 encoding and decoding in
+ the form of convenience methods and input/output streams.
+ </P>
+
+ <P style="text-align:center; font-weight:bold; font-size:larger">
+ <a href="http://prdownloads.sourceforge.net/iharder/Base64-2.1.zip?download">Download v2.1 Now! base64.zip (40k)</a>
+ </P>
+
+ <p>
+ You can have SourceForge automatically notify you when this Base64 code
+ is updated (I highly recommend you do this).
+ <a href="http://sourceforge.net/project/filemodule_monitor.php?filemodule_id=30229">Click here.</a>
+ </p>
+
+ <p>
+ There are other Base64 utilities on the Internet, some part
+ of proprietary packages, some with various open source licenses.
+ In any event, I hope with one or more of these Base64 tools, you won't
+ have to write your own like I did.
+ </p>
+<p>
+Thanks to Brian Burton for providing this <a href="Base64Test.java">Base64Test.java</a> test class for use with <a href="http://www.junit.org">JUnit.org</a>.
+</p>
+
+
+ <p>
+ <strong>Changes:</strong>
+ <ul>
+<li>v2.1 - Cleaned up javadoc comments and unused variables and methods. Added
+ some convenience methods for reading and writing to and from files.</li>
+ <li>
+ v2.0.2 - Now specifies UTF-8 encoding in places where the code fails on systems
+ with other encodings (like EBCDIC).
+ </li>
+
+ <li>v2.0.1 - Fixed an error when decoding a single byte, that is, when the
+ encoded data was a single byte.</li>
+ <li>v2.0 - I got rid of methods that used booleans to set options.
+ Now everything is more consolidated and cleaner. The code now detects
+ when data that's being decoded is gzip-compressed and will decompress it
+ automatically. Generally things are cleaner. You'll probably have to
+ change some method calls that you were making to support the new
+ options format (<tt>int</tt>s that you "OR" together).</li>
+
+ <li>v1.5.1 - Fixed bug when decompressing and decoding to a
+ byte[] using <tt>decode( String s, boolean gzipCompressed )</tt>.
+ Added the ability to "suspend" encoding in the Output Stream so
+ you can turn on and off the encoding if you need to embed base64
+ data in an otherwise "normal" stream (like an XML file).
+ <em>This has not been fully tested, so please alert me to bugs.</em></li>
+ <li>v1.5 - Output stream pases on flush() command but doesn't do anything itself. This helps when using GZIP streams. Added the ability to <strong>GZip-compress objects</strong> before encoding them.</li>
+ <li>v1.4 - Added some helper methods for reading and writing to/from files.</li>
+ <li>v1.3.6 - Fixed OutputStream.flush() so that 'position' is reset.</li>
+ <li>v1.3.5 - Added flag to turn on and off line breaks. Fixed bug in input stream
+ where last buffer being read, if not completely full, was not returned.</li>
+ <li>v1.3.4 - Fixed when <em>Improperly padded base64 stream</em> exception
+ was incorrectly thrown.</li>
+ <li>A bug has been fixed that kept I/O streams from working at all, really.</li>
+ <li>A bug has been fixed affecting you if you use the Base64.InputStream
+ to encode data.
+ </li>
+ <li>A bug has been fixed where if you specified an offset when encoding
+ an array of bytes, the offset was ignored.
+ </li>
+ </ul>
+ </p>
+
+ </div>
+
+ <div class="MainSectionTitle">Example</div><div class="MainSectionBody">
+ <p>
+ The easiest way to convert some data is with the convenience methods:
+ </p>
+<code><pre>String result1 = <strong>Base64.encodeObject</strong>( mySerializableObject );
+String result2 = <strong>Base64.encodeBytes</strong>( new byte[]{ 3, 34, 116, 9 } );
+</pre></code>
+
+ <p>
+ Or you can use the very efficient streams:
+ </p>
+<code><pre>OutputStream out = <strong>new Base64.OutputStream</strong>(
+ new FileOutputStream( "out.txt" ) );
+// Go on about your outputting...
+// ...
+
+InputStream in = <strong>new Base64.InputStream</strong>(
+ new FileInputStream( "in.txt" ) );
+// Go on about your inputting...
+// ...
+</pre></code>
+
+
+ <p>
+ There are defaults (OutputStream encodes, InputStream decodes),
+ but you can easily override that:
+ </p>
+<code><pre>OutputStream out = new Base64.OutputStream(
+ new FileOutputStream( "out.txt" ), <strong>Base64.DECODE</strong> );
+// Go on about your outputting...
+// ...
+</pre></code>
+
+ </div>
+
+
+ </div>
+ </td>
+ </tr>
+ <tr>
+ <td bgcolor="#9090d0" style="height: 1em; border-right: solid black 1px"> </td>
+ <td>
+ <div class="BottomMenu">
+ <span class="Menu"><a title="" href="./.">Home</a> | </span>
+ <span class="Menu"><a title="A Java framework for the Tabu Search meta-heuristic" href="http://OpenTS.iHarder.net">OpenTS</a> | </span>
+ <span class="Menu"><a title="Software and tutorials for programming Mac OS X" href="./macosx">Mac OS X</a> | </span>
+ <span class="Menu"><a title="Xmlize (like serialize) your Java objects into XML documents." href="./xmlizable">Xmlizable</a> | </span>
+ <span class="Menu"><a title="Public Domain Base64 Java utility." href="./base64">Base64</a> | </span>
+ <span class="Menu"><a title="Drag and drop files into your Java programs" href="./filedrop">FileDrop</a> | </span>
+ <span class="Menu"><a title="View Mr. Harder's online resume" href="http://resume.iharder.net">Mr. Harder's Resume</a> | </span>
+ <span class="Menu"><a title="Send email to Mr. Harder" href="mailto:robertharder[nospam]gmail.com">Contact Mr. Harder</a> | </span>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </body>
+</html>
More information about the jboss-svn-commits
mailing list