savara SVN: r119 - tools/eclipse/trunk/plugins/org.pi4soa.monitor.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2009-12-07 18:50:34 -0500 (Mon, 07 Dec 2009)
New Revision: 119
Added:
tools/eclipse/trunk/plugins/org.pi4soa.monitor/classes/
Log:
16 years, 4 months
- 1
- 0
savara SVN: r118 - in tools/eclipse/trunk/plugins/org.pi4soa.monitor: META-INF and 3 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2009-12-07 18:23:54 -0500 (Mon, 07 Dec 2009)
New Revision: 118
Added:
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/concurrent.jar
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/javassist.jar
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-aop-client.jar
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-client.jar
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-common-core.jar
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-javaee.jar
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-logging-spi.jar
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-mdr.jar
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-messaging-client.jar
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-remoting.jar
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jnp-client.jar
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/log4j.jar
tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/trove.jar
Modified:
tools/eclipse/trunk/plugins/org.pi4soa.monitor/.classpath
tools/eclipse/trunk/plugins/org.pi4soa.monitor/META-INF/MANIFEST.MF
tools/eclipse/trunk/plugins/org.pi4soa.monitor/build.properties
tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/eclipse/MonitorLauncher.java
tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/ui/Monitor.java
Log:
SAVARA-48 - include pi4soa swing based monitor as part of Savara temporarily until a SAM and JOPR based solution is available.
Modified: tools/eclipse/trunk/plugins/org.pi4soa.monitor/.classpath
===================================================================
--- tools/eclipse/trunk/plugins/org.pi4soa.monitor/.classpath 2009-12-07 17:57:30 UTC (rev 117)
+++ tools/eclipse/trunk/plugins/org.pi4soa.monitor/.classpath 2009-12-07 23:23:54 UTC (rev 118)
@@ -1,7 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src/java"/>
+ <classpathentry exported="true" kind="lib" path="lib/log4j.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/trove.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="lib" path="lib/jboss-client.jar"/>
+ <classpathentry kind="lib" path="lib/jboss-javaee.jar"/>
+ <classpathentry kind="lib" path="lib/jnp-client.jar"/>
+ <classpathentry kind="lib" path="lib/jboss-logging-spi.jar"/>
+ <classpathentry kind="lib" path="lib/jboss-messaging-client.jar"/>
+ <classpathentry kind="lib" path="lib/jboss-aop-client.jar"/>
+ <classpathentry kind="lib" path="lib/jboss-mdr.jar"/>
<classpathentry kind="output" path="classes"/>
</classpath>
Modified: tools/eclipse/trunk/plugins/org.pi4soa.monitor/META-INF/MANIFEST.MF
===================================================================
--- tools/eclipse/trunk/plugins/org.pi4soa.monitor/META-INF/MANIFEST.MF 2009-12-07 17:57:30 UTC (rev 117)
+++ tools/eclipse/trunk/plugins/org.pi4soa.monitor/META-INF/MANIFEST.MF 2009-12-07 23:23:54 UTC (rev 118)
@@ -23,4 +23,17 @@
org.eclipse.emf.ecore,
org.pi4soa.common
Eclipse-LazyStart: true
-Bundle-ClassPath: .
+Bundle-ClassPath: .,
+ lib/concurrent.jar,
+ lib/javassist.jar,
+ lib/jboss-aop-client.jar,
+ lib/jboss-client.jar,
+ lib/jboss-common-core.jar,
+ lib/jboss-javaee.jar,
+ lib/jboss-logging-spi.jar,
+ lib/jboss-mdr.jar,
+ lib/jboss-messaging-client.jar,
+ lib/jboss-remoting.jar,
+ lib/jnp-client.jar,
+ lib/log4j.jar,
+ lib/trove.jar
Modified: tools/eclipse/trunk/plugins/org.pi4soa.monitor/build.properties
===================================================================
--- tools/eclipse/trunk/plugins/org.pi4soa.monitor/build.properties 2009-12-07 17:57:30 UTC (rev 117)
+++ tools/eclipse/trunk/plugins/org.pi4soa.monitor/build.properties 2009-12-07 23:23:54 UTC (rev 118)
@@ -3,11 +3,26 @@
bin.includes = META-INF/,\
.,\
plugin.xml,\
- LICENSE.txt
+ LICENSE.txt,\
+ lib/,\
+ lib/concurrent.jar,\
+ lib/javassist.jar,\
+ lib/jboss-aop-client.jar,\
+ lib/jboss-client.jar,\
+ lib/jboss-common-core.jar,\
+ lib/jboss-javaee.jar,\
+ lib/jboss-logging-spi.jar,\
+ lib/jboss-mdr.jar,\
+ lib/jboss-messaging-client.jar,\
+ lib/jboss-remoting.jar,\
+ lib/jnp-client.jar,\
+ lib/log4j.jar,\
+ lib/trove.jar
src.includes = .classpath,\
.project,\
LICENSE.txt,\
META-INF/,\
build.properties,\
plugin.xml,\
- src/
+ src/,\
+ lib/
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/concurrent.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/concurrent.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/javassist.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/javassist.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-aop-client.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-aop-client.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-client.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-client.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-common-core.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-common-core.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-javaee.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-javaee.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-logging-spi.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-logging-spi.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-mdr.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-mdr.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-messaging-client.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-messaging-client.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-remoting.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jboss-remoting.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jnp-client.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/jnp-client.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/log4j.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/log4j.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/trove.jar
===================================================================
(Binary files differ)
Property changes on: tools/eclipse/trunk/plugins/org.pi4soa.monitor/lib/trove.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/eclipse/MonitorLauncher.java
===================================================================
--- tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/eclipse/MonitorLauncher.java 2009-12-07 17:57:30 UTC (rev 117)
+++ tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/eclipse/MonitorLauncher.java 2009-12-07 23:23:54 UTC (rev 118)
@@ -23,12 +23,14 @@
import java.text.MessageFormat;
import java.util.Map;
import java.util.Vector;
+import java.util.logging.Level;
import java.util.logging.Logger;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.NullProgressMonitor;
+import org.eclipse.core.runtime.Platform;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.core.ILaunch;
import org.eclipse.debug.core.ILaunchConfiguration;
@@ -44,6 +46,9 @@
import org.eclipse.jdt.launching.IVMInstall;
import org.eclipse.jdt.launching.IVMRunner;
import org.eclipse.jdt.launching.VMRunnerConfiguration;
+import org.eclipse.osgi.util.ManifestElement;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.Constants;
import org.pi4soa.common.eclipse.BundleUtil;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
@@ -212,6 +217,7 @@
* @param configuration The launch configuation
* @return The list of classpath entries
*/
+ /*
public String[] getClasspath(ILaunchConfiguration configuration) {
String[] ret=null;
Vector classpathEntries=new Vector();
@@ -277,6 +283,160 @@
return(ret);
}
+ */
+ public String[] getClasspath(ILaunchConfiguration configuration) {
+ String[] ret=null;
+ java.util.Vector<String> classpathEntries=new java.util.Vector<String>();
+
+ // Add classpath entry for current Java project
+ try {
+ String projname=configuration.getAttribute(
+ MonitorLaunchConfigurationConstants.ATTR_PROJECT_NAME, "");
+
+ IProject project=
+ ResourcesPlugin.getWorkspace().getRoot().getProject(projname);
+
+ IJavaProject jproject=JavaCore.create(project);
+
+ // Add output location
+ IPath outputLocation=jproject.getOutputLocation();
+
+ IFolder folder=
+ ResourcesPlugin.getWorkspace().getRoot().getFolder(outputLocation);
+
+ String path=folder.getLocation().toString();
+
+ classpathEntries.add(path);
+
+ // Add other libraries to the classpath
+ IClasspathEntry[] curclspath=jproject.getRawClasspath();
+ for (int i=0; curclspath != null &&
+ i < curclspath.length; i++) {
+
+ if (curclspath[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
+ IFile file=
+ ResourcesPlugin.getWorkspace().
+ getRoot().getFile(curclspath[i].getPath());
+
+ if (file.exists()) {
+ // Library is within the workspace
+ classpathEntries.add(file.getLocation().toString());
+ } else {
+ // Assume library is external to workspace
+ classpathEntries.add(curclspath[i].getPath().toString());
+ }
+
+ } else if (curclspath[i].getEntryKind() ==
+ IClasspathEntry.CPE_CONTAINER) {
+ // Container's not currently handled - but
+ // problem need to retrieve from project and
+ // iterate over container entries
+ }
+ }
+
+ } catch(Exception e) {
+ // TODO: report error
+ }
+
+ buildClassPath("org.pi4soa.monitor", classpathEntries);
+ buildClassPath("org.pi4soa.service", classpathEntries);
+ buildClassPath("org.pi4soa.common", classpathEntries);
+ buildClassPath("org.pi4soa.cdl", classpathEntries);
+ buildClassPath("org.eclipse.emf.ecore", classpathEntries);
+ buildClassPath("org.eclipse.emf.ecore.xmi", classpathEntries);
+ buildClassPath("org.eclipse.emf.common", classpathEntries);
+ buildClassPath("org.apache.xalan", classpathEntries);
+ buildClassPath("org.apache.xml.serializer", classpathEntries);
+
+ ret = new String[classpathEntries.size()];
+ classpathEntries.copyInto(ret);
+
+ if (logger.isLoggable(Level.FINEST)) {
+ logger.finest("Scenario Simulation Classpath:");
+ for (int i=0; i < ret.length; i++) {
+ logger.finest(" ["+i+"] "+ret[i]);
+ }
+ }
+
+ return(ret);
+ }
+
+ protected void buildClassPath(String bundleId, java.util.List<String> entries) {
+ Bundle bundle= Platform.getBundle(bundleId);
+ if (bundle != null) {
+ java.net.URL installLocation= bundle.getEntry("/");
+ java.net.URL local= null;
+ try {
+ local= Platform.asLocalURL(installLocation);
+ } catch (java.io.IOException e) {
+ e.printStackTrace();
+ }
+
+ String baseLocation = local.getFile();
+
+ try {
+ String requires = (String)bundle.getHeaders().get(Constants.BUNDLE_CLASSPATH);
+ ManifestElement[] elements = ManifestElement.parseHeader(Constants.BUNDLE_CLASSPATH, requires);
+
+ for (int i=0; elements != null && i < elements.length; i++) {
+
+ String path=baseLocation+elements[i].getValue();
+
+ // Check if path is for a Jar and that the
+ // file exists - if not see if a classes
+ // directory exists
+ if (path.endsWith(".jar")) {
+
+ if ((new File(path)).exists() == false) {
+ if ((new File(baseLocation+"classes")).exists()) {
+ path = baseLocation+"classes";
+ }
+ }
+ }
+
+ if (entries.contains(path) == false) {
+ if (logger.isLoggable(Level.FINE)) {
+ logger.fine("Adding classpath entry '"+
+ path+"'");
+ }
+ entries.add(path);
+
+ if (elements[i].getValue().equals(".")) {
+ if ((new File(baseLocation+"classes")).exists()) {
+ path = baseLocation+"classes";
+
+ entries.add(path);
+ }
+ }
+ }
+ }
+
+ if (elements == null) {
+ if (logger.isLoggable(Level.FINE)) {
+ logger.fine("Adding classpath entry '"+
+ baseLocation+"'");
+ }
+ entries.add(baseLocation);
+ }
+
+ /*
+ requires = (String)bundle.getHeaders().get(Constants.REQUIRE_BUNDLE);
+ elements = ManifestElement.parseHeader(Constants.REQUIRE_BUNDLE, requires);
+
+ for (int i=0; recursive &&
+ elements != null && i < elements.length; i++) {
+ buildClasspathEntries(elements[i].getValue(),
+ entries, false);
+ }
+ */
+
+ } catch(Exception e) {
+ logger.severe("Failed to construct classpath: "+e);
+ e.printStackTrace();
+ }
+ }
+ }
+
private static Logger logger = Logger.getLogger("org.pi4soa.monitor.eclipse");
}
\ No newline at end of file
Modified: tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/ui/Monitor.java
===================================================================
--- tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/ui/Monitor.java 2009-12-07 17:57:30 UTC (rev 117)
+++ tools/eclipse/trunk/plugins/org.pi4soa.monitor/src/java/org/pi4soa/monitor/ui/Monitor.java 2009-12-07 23:23:54 UTC (rev 118)
@@ -24,6 +24,7 @@
import java.awt.BorderLayout;
import java.io.IOException;
+import java.util.logging.Level;
import java.util.logging.Logger;
import org.pi4soa.service.correlator.CorrelationSession;
@@ -228,7 +229,7 @@
}
catch(Exception e){
// hack
- logger.severe("Exception while trying to monitor choreography " + e);
+ logger.log(Level.SEVERE, "Exception while trying to monitor choreography " + e, e);
JOptionPane.showMessageDialog(null,
"Failed to initialize monitor: "+e.getLocalizedMessage(),
16 years, 4 months
- 1
- 0
savara SVN: r117 - in validator/trunk: jbossesb/src/main/configs and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2009-12-07 12:57:30 -0500 (Mon, 07 Dec 2009)
New Revision: 117
Added:
validator/trunk/jbossesb/src/main/configs/pi4soa.xml
Removed:
validator/trunk/distribution/src/files/jbossesb/build.xml
validator/trunk/distribution/src/files/jbossesb/models/
validator/trunk/distribution/src/files/jbossesb/pi4soa.sar/
validator/trunk/distribution/src/files/jbossesb/readme.txt
Log:
SAVARA-49 - remove unnecessary pi4soa.sar and models folder. Moved pi4soa.xml to the validator.esb module.
Deleted: validator/trunk/distribution/src/files/jbossesb/build.xml
===================================================================
--- validator/trunk/distribution/src/files/jbossesb/build.xml 2009-12-07 16:21:38 UTC (rev 116)
+++ validator/trunk/distribution/src/files/jbossesb/build.xml 2009-12-07 17:57:30 UTC (rev 117)
@@ -1,75 +0,0 @@
-<project name="validator" default="deploy" basedir=".">
-
- <property name="target-server" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}" />
-
-<!-- ==================================================================== -->
-<!-- This section handles the discovery of the messaging platform. -->
-<!-- ==================================================================== -->
-
- <target name="messaging-config" >
- <property name="org.jboss.esb.server.deploy.dir"
- value="${target-server}/deploy"/>
-
- <condition property="messaging.present">
- <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
- </condition>
- <condition property="messaging.present">
- <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging.sar"/>
- </condition>
-
- <condition property="jbossmq.present">
- <not>
- <isset property="messaging.present"/>
- </not>
- </condition>
- </target>
-
- <!-- dependencies specific to JBoss Messaging -->
- <target name="messaging-dependencies" if="messaging.present" depends="messaging-config">
- <property name="jms.service.file" value="jbm-queue-service.xml"/>
- <property name="jms.description" value="JBoss Messaging"/>
- </target>
-
- <!-- dependencies specific to JBoss MQ -->
- <target name="jbossmq-dependencies" if="jbossmq.present" depends="messaging-config">
- <property name="jms.service.file" value="jbmq-queue-service.xml"/>
- <property name="jms.description" value="JBoss MQ"/>
- </target>
-
-<!-- ==================================================================== -->
-<!-- This section handles the deploy and undeploy targets. -->
-<!-- ==================================================================== -->
-
- <target name="deploy" depends="register-validator-filter,messaging-dependencies,jbossmq-dependencies">
- <echo message="Deploy pi4soa.sar, savara-validator-jbossesb.esb files to the target server '${target-server}'." />
- <copy todir="${target-server}/deploy/pi4soa.sar">
- <fileset dir="${basedir}/pi4soa.sar">
- <exclude name="jms/**" />
- </fileset>
- </copy>
- <copy todir="${target-server}/deploy/pi4soa.sar"
- file="${basedir}/pi4soa.sar/jms/${jms.service.file}" />
- <copy todir="${target-server}/deploy/savara-validator-jbossesb.esb">
- <fileset dir="${basedir}/savara-validator-jbossesb.esb" />
- </copy>
- </target>
-
- <target name="undeploy" depends="unregister-validator-filter">
- <echo message="Undeploy pi4soa.sar, savara-validator-jbossesb.esb files from the target sever '${target-server}'."/>
- <delete dir="${target-server}/deploy/pi4soa.sar" />
- <delete dir="${target-server}/deploy/savara-validator-jbossesb.esb" />
- </target>
-
- <target name="register-validator-filter">
- <echo message="register the validator filter in the jbossesb-properties file" />
- <delete file="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" />
- <copy file="${basedir}/conf/jbossesb-properties-validator.xml" tofile="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" />
- </target>
-
- <target name="unregister-validator-filter">
- <echo message="unregister the validator filter from the jbossesb-properties file" />
- <delete file="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" />
- <copy file="${basedir}/conf/jbossesb-properties.xml" tofile="${target-server}/deploy/jbossesb.sar/jbossesb-properties.xml" />
- </target>
-
-</project>
Deleted: validator/trunk/distribution/src/files/jbossesb/readme.txt
===================================================================
--- validator/trunk/distribution/src/files/jbossesb/readme.txt 2009-12-07 16:21:38 UTC (rev 116)
+++ validator/trunk/distribution/src/files/jbossesb/readme.txt 2009-12-07 17:57:30 UTC (rev 117)
@@ -1,37 +0,0 @@
-Required to deploy the validator libraries.
-- ANT
-
-Folder structures
------------------------
-1 - pi4soa.sar
-
-2 - savara-validator-jbossesb.esb It contains the monitor config file (WS-CDL file) that will be used by the Filter.
-
-3 - conf/ It contains the proper configuration for governance deployment.
-
-4 - models It contains the WS-CDL models archive.
-
-
-
-Instructions for deploying/undeploying by using ANT (recommended)
-------------------------------------------------------------------
-1 - Go to $savara/install directory.
-
-2 - Run "ant deploy-savara-validator" to deploy the validator libraries.
-
-3 - Run "ant undeploy-savara-validator" to undeploy the validator libraries.
-
-
-
-Deploying validator libraries manually
------------------------------------------------------------
-
-1 - Copy the "pi4soa.sar", "monitor.esb" two libraries to the $JBossESB/server/config (e.g. default)/deploy folder.
-
-2 - Open up the "jbossesb-properties.xml", which is loated in the $JBossESB/server/$domain/deploy/jbossesb.sar folder.
-
- Add following "monitor filter" in the file, at the bottom of the '<properties name="filter">' xml block.
-
- ' <property name="org.jboss.soa.esb.filter.10" value="org.pi4soa.jbossesb.monitor.MonitorFilter" /> '
-
-
Added: validator/trunk/jbossesb/src/main/configs/pi4soa.xml
===================================================================
--- validator/trunk/jbossesb/src/main/configs/pi4soa.xml (rev 0)
+++ validator/trunk/jbossesb/src/main/configs/pi4soa.xml 2009-12-07 17:57:30 UTC (rev 117)
@@ -0,0 +1,38 @@
+<!--
+/*
+# * Copyright 2005-8 Pi4 Technologies Ltd
+# *
+# * Licensed under the Apache License, Version 2.0 (the "License");
+# * you may not use this file except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# * http://www.apache.org/licenses/LICENSE-2.0
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *
+# *
+# * Change History:
+# * 16, June 2008: Initial version created by gary
+# */
+-->
+
+<pi4soa>
+ <container>
+ <serviceTracker class="org.pi4soa.service.tracker.jms.JMSServiceTracker" >
+ <jmsConnectionFactory>ConnectionFactory</jmsConnectionFactory>
+ <jmsDestination>topic/tracker</jmsDestination>
+ <recordMessagePayload>true</recordMessagePayload>
+ </serviceTracker>
+ </container>
+ <monitor>
+ <serviceTracker class="org.pi4soa.service.tracker.jms.JMSServiceTracker" >
+ <jmsConnectionFactory>ConnectionFactory</jmsConnectionFactory>
+ <jmsDestination>topic/tracker</jmsDestination>
+ <recordMessagePayload>true</recordMessagePayload>
+ </serviceTracker>
+ </monitor>
+</pi4soa>
\ No newline at end of file
16 years, 4 months
- 1
- 0
savara SVN: r116 - in validator/trunk/jbossesb: src/main/configs and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2009-12-07 11:21:38 -0500 (Mon, 07 Dec 2009)
New Revision: 116
Modified:
validator/trunk/jbossesb/pom.xml
validator/trunk/jbossesb/src/main/configs/esb-assembly.xml
Log:
SAVARA-49 - remove dependency on pi4soa.sar and obtain dependent jars from maven into the validator.esb on build.
Modified: validator/trunk/jbossesb/pom.xml
===================================================================
--- validator/trunk/jbossesb/pom.xml 2009-12-06 16:44:03 UTC (rev 115)
+++ validator/trunk/jbossesb/pom.xml 2009-12-07 16:21:38 UTC (rev 116)
@@ -31,34 +31,39 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.jboss.overlord.dependencies.org.pi4soa</groupId>
+ <groupId>org.jboss.savara.dependencies.pi4soa</groupId>
<artifactId>pi4soa-common</artifactId>
<version>2.0</version>
<!-- >scope>provided</scope -->
</dependency>
<dependency>
- <groupId>org.jboss.overlord.dependencies.org.pi4soa</groupId>
+ <groupId>org.jboss.savara.dependencies.pi4soa</groupId>
<artifactId>pi4soa-cdl</artifactId>
<version>2.0</version>
<!-- >scope>provided</scope -->
</dependency>
<dependency>
- <groupId>org.jboss.overlord.dependencies.org.pi4soa</groupId>
+ <groupId>org.jboss.savara.dependencies.pi4soa</groupId>
<artifactId>pi4soa-service</artifactId>
<version>2.0</version>
<!-- >scope>provided</scope -->
</dependency>
<dependency>
- <groupId>org.jboss.overlord.dependencies.org.eclipse.emf</groupId>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
<artifactId>emf-common</artifactId>
<version>2.3.0</version>
</dependency>
<dependency>
- <groupId>org.jboss.overlord.dependencies.org.eclipse.emf</groupId>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
<artifactId>emf-ecore</artifactId>
<version>2.3.1</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-ecore-xmi</artifactId>
+ <version>2.3.1</version>
+ </dependency>
</dependencies>
<build>
Modified: validator/trunk/jbossesb/src/main/configs/esb-assembly.xml
===================================================================
--- validator/trunk/jbossesb/src/main/configs/esb-assembly.xml 2009-12-06 16:44:03 UTC (rev 115)
+++ validator/trunk/jbossesb/src/main/configs/esb-assembly.xml 2009-12-07 16:21:38 UTC (rev 116)
@@ -20,11 +20,12 @@
<outputDirectory>/lib</outputDirectory>
<includes>
<include>org.jboss.savara.validator:savara-validator-jbossesb</include>
- <include>org.jboss.overlord.dependencies.org.pi4soa:pi4soa-common</include>
- <include>org.jboss.overlord.dependencies.org.pi4soa:pi4soa-cdl</include>
- <include>org.jboss.overlord.dependencies.org.pi4soa:pi4soa-service</include>
- <include>org.jboss.overlord.dependencies.org.eclipse.emf:emf-common</include>
- <include>org.jboss.overlord.dependencies.org.eclipse.emf:emf-ecore</include>
+ <include>org.jboss.savara.dependencies.pi4soa:pi4soa-common</include>
+ <include>org.jboss.savara.dependencies.pi4soa:pi4soa-cdl</include>
+ <include>org.jboss.savara.dependencies.pi4soa:pi4soa-service</include>
+ <include>org.jboss.savara.dependencies.eclipse:emf-common</include>
+ <include>org.jboss.savara.dependencies.eclipse:emf-ecore</include>
+ <include>org.jboss.savara.dependencies.eclipse:emf-ecore-xmi</include>
</includes>
</dependencySet>
</dependencySets>
16 years, 4 months
- 1
- 0
savara SVN: r115 - validator/trunk/samples/jbossesb/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2009-12-06 11:44:03 -0500 (Sun, 06 Dec 2009)
New Revision: 115
Modified:
validator/trunk/samples/jbossesb/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerJMS.java
Log:
SAVARA-1 - add wait into JMS bank, to stop from quiting immediately.
Modified: validator/trunk/samples/jbossesb/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerJMS.java
===================================================================
--- validator/trunk/samples/jbossesb/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerJMS.java 2009-12-06 16:23:07 UTC (rev 114)
+++ validator/trunk/samples/jbossesb/trailblazer/banks/src/org/jboss/soa/esb/samples/loanbroker/banks/ManagerJMS.java 2009-12-06 16:44:03 UTC (rev 115)
@@ -265,9 +265,12 @@
ManagerJMS managerJMS = new ManagerJMS();
try {
managerJMS.listen();
+
+ synchronized(managerJMS) {
+ managerJMS.wait();
+ }
} catch (final Exception ex) {
logger.error(ex.getMessage(), ex) ;
}
-
}
-}
\ No newline at end of file
+}
16 years, 4 months
- 1
- 0
savara SVN: r114 - in validator/trunk: docs/samplesguide/src/main/module and 4 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2009-12-06 11:23:07 -0500 (Sun, 06 Dec 2009)
New Revision: 114
Modified:
validator/trunk/distribution/src/main/assembly/bin.xml
validator/trunk/docs/samplesguide/src/main/module/servicevalidator.xml
validator/trunk/jbossesb/pom.xml
validator/trunk/samples/jbossesb/trailblazer/banks/build.xml
validator/trunk/samples/jbossesb/trailblazer/build.xml
validator/trunk/samples/jbossesb/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java
Log:
Fix issues related to the trailblazer example (SAVARA-1)
Modified: validator/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- validator/trunk/distribution/src/main/assembly/bin.xml 2009-12-06 13:47:06 UTC (rev 113)
+++ validator/trunk/distribution/src/main/assembly/bin.xml 2009-12-06 16:23:07 UTC (rev 114)
@@ -45,7 +45,7 @@
<fileSet>
<directory>src/files/jbossesb/conf</directory>
- <outputDirectory>/modules</outputDirectory>
+ <outputDirectory>/modules/conf</outputDirectory>
</fileSet>
<!-- copy documents -->
@@ -99,6 +99,11 @@
<!-- copy client & trailblazer example-->
<fileSet>
+ <directory>../samples/jbossesb/trailblazer</directory>
+ <outputDirectory>samples/trailblazer</outputDirectory>
+ </fileSet>
+
+ <fileSet>
<directory>../samples/jbossesb/client</directory>
<outputDirectory>samples/client</outputDirectory>
</fileSet>
Modified: validator/trunk/docs/samplesguide/src/main/module/servicevalidator.xml
===================================================================
--- validator/trunk/docs/samplesguide/src/main/module/servicevalidator.xml 2009-12-06 13:47:06 UTC (rev 113)
+++ validator/trunk/docs/samplesguide/src/main/module/servicevalidator.xml 2009-12-06 16:23:07 UTC (rev 114)
@@ -34,12 +34,12 @@
<orderedlist>
<listitem>
-Update the <filename>${JBossAS}/server/default/deploy/jbossesb.sar/jbossesb-properties.xml</filename>
+Update the <filename>${JBossAS}/server/default/deployers/esb.deployer/jbossesb-properties.xml</filename>
file, in the section entitled "transports" and specify all of the SMTP mail server settings for your
environment.
</listitem>
<listitem>
-Update the <filename>trailblazer/trailblazer.properties</filename>
+Update the <filename>${SAVARA-Validator}/samples/trailblazer/trailblazer.properties</filename>
<para>
Update the <property>file.bank.monitored.directory</property> and
<property>file.output.directory</property> properties. These are folders used by the File Based Bank,
@@ -79,11 +79,6 @@
file, and choose the <emphasis>Choreography->Monitor</emphasis> menu item.
</para>
-<note>
-<para>
-TO BE UPDATED WITH JOPR APPROACH
-</para>
-</note>
<imageobject>
<imagedata fileref="images/MonitorMenu.jpg" align="center" width="2in" />
</imageobject>
Modified: validator/trunk/jbossesb/pom.xml
===================================================================
--- validator/trunk/jbossesb/pom.xml 2009-12-06 13:47:06 UTC (rev 113)
+++ validator/trunk/jbossesb/pom.xml 2009-12-06 16:23:07 UTC (rev 114)
@@ -48,17 +48,16 @@
<version>2.0</version>
<!-- >scope>provided</scope -->
</dependency>
+
<dependency>
<groupId>org.jboss.overlord.dependencies.org.eclipse.emf</groupId>
<artifactId>emf-common</artifactId>
<version>2.3.0</version>
- <!-- >scope>provided</scope -->
</dependency>
<dependency>
<groupId>org.jboss.overlord.dependencies.org.eclipse.emf</groupId>
<artifactId>emf-ecore</artifactId>
<version>2.3.1</version>
- <!-- >scope>provided</scope -->
</dependency>
</dependencies>
Modified: validator/trunk/samples/jbossesb/trailblazer/banks/build.xml
===================================================================
--- validator/trunk/samples/jbossesb/trailblazer/banks/build.xml 2009-12-06 13:47:06 UTC (rev 113)
+++ validator/trunk/samples/jbossesb/trailblazer/banks/build.xml 2009-12-06 16:23:07 UTC (rev 114)
@@ -3,8 +3,8 @@
<property file="../trailblazer.properties"/>
<property name="install.dir" value="../../../install"/>
<property file="${install.dir}/deployment.properties"/>
- <property name="org.jboss.esb.server.server" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}" />
- <property name="org.jboss.esb.server.deploy.dir" value="${org.jboss.esb.server.server}/deploy" />
+ <property name="org.jboss.as.server" value="${org.jboss.as.home}/server/${org.jboss.as.config}" />
+ <property name="org.jboss.as.deploy.dir" value="${org.jboss.as.server}/deploy" />
<!-- Some default build locations -->
@@ -18,17 +18,17 @@
<property name="org.jboss.esb.samples.loanbroker.banks.tests.report.dir" value="${basedir}/build/tests"/>
<path id="org.jboss.esb.samples.loanbroker.banks.classpath">
- <fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-remoting.jar jboss-j2ee.jar jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
- <fileset dir="${org.jboss.esb.server.server}/lib" includes="hibernate3.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. -->
- <fileset dir="${org.jboss.esb.server.server}/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. -->
- <fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. -->
- <fileset dir="${org.jboss.esb.server.deploy.dir}/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.as.home}/client" includes="jboss-remoting.jar jboss-javaee.jar jboss-messaging-client.jar jboss-aop-client.jar jboss-mdr.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.as.server}/lib" includes="hibernate3.jar commons-collections.jar hsqldb.jar" /> <!-- Required for jbpm Client Code. -->
+ <fileset dir="${org.jboss.as.server}/lib" includes="bsh.jar" /> <!-- Required for scripting Client Code. -->
+ <fileset dir="${org.jboss.as.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. -->
+ <!-- fileset dir="${org.jboss.as.deploy.dir}/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" / --> <!-- Required for JMS Client Code. -->
<fileset dir="${org.jboss.esb.samples.loanbroker.banks.lib.ext.dir}" includes="*.jar"/>
</path>
<path id="org.jboss.esb.samples.loanbroker.banks.testclasspath">
- <fileset dir="${org.jboss.esb.server.server}/lib" includes="jboss-remoting.jar jboss-j2ee.jar jboss-messaging-client.jar" /> <!-- Required for JMS Client Code. -->
- <fileset dir="${org.jboss.esb.server.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. -->
- <fileset dir="${org.jboss.esb.server.deploy.dir}/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.as.home}/client" includes="jboss-remoting.jar jboss-javaee.jar jboss-messaging-client.jar jboss-aop-client.jar jboss-mdr.jar" /> <!-- Required for JMS Client Code. -->
+ <fileset dir="${org.jboss.as.home}/lib/endorsed" includes="*.jar" /> <!-- Required for JMS Client Code. -->
+ <!-- fileset dir="${org.jboss.as.deploy.dir}/jboss-aop-jdk50.deployer" includes="jboss-aop-jdk50.jar" / --> <!-- Required for JMS Client Code. -->
<fileset dir="${org.jboss.esb.samples.loanbroker.banks.lib.ext.dir}" includes="*.jar"/>
<pathelement location="${org.jboss.esb.samples.loanbroker.banks.classes.dir}"/>
<pathelement location="${org.jboss.esb.samples.loanbroker.banks.testclasses.dir}"/>
Modified: validator/trunk/samples/jbossesb/trailblazer/build.xml
===================================================================
--- validator/trunk/samples/jbossesb/trailblazer/build.xml 2009-12-06 13:47:06 UTC (rev 113)
+++ validator/trunk/samples/jbossesb/trailblazer/build.xml 2009-12-06 16:23:07 UTC (rev 114)
@@ -6,8 +6,8 @@
<property file="${install.dir}/deployment.properties"/>
<property name="esb.home.dir" value="${org.jboss.esb.home}"/>
- <property name="org.jboss.esb.server.home" value="${org.jboss.esb.server.home}"/>
- <property name="org.jboss.esb.server.config" value="${org.jboss.esb.server.config}"/>
+ <property name="org.jboss.as.home" value="${org.jboss.as.home}"/>
+ <property name="org.jboss.as.config" value="${org.jboss.as.config}"/>
<!-- properties for the esb part of the trailblazer -->
<property name="esb.dest" value="${basedir}/esb/build"/>
@@ -53,13 +53,13 @@
<property name="soa.esb.lib.ext.dir" value="${soa.esb.lib.dir}/ext"/>
- <property name="target-server" value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}" />
+ <property name="target-server" value="${org.jboss.as.home}/server/${org.jboss.as.config}" />
<!-- classpath -->
<path id="esb.samples.trailblazer.esb.classpath">
<fileset dir="${soa.esb.lib.dir}/ext" includes="*.jar"/>
<fileset dir="${esb.lib.dir}/ext" includes="*.jar"/>
- <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/>
+ <fileset dir="${org.jboss.as.home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/>
<fileset dir="${soa.esb.lib.dir}" includes="*.jar"/>
<fileset dir="${esb.samples.trailblazer.client.lib.dir}/ext" includes="*.jar"/>
</path>
@@ -71,7 +71,7 @@
<fileset dir="${esb.dest}/dist" includes="trailblazer-esb.jar"/>
<fileset dir="${esb.home.dir}/lib/ext" includes="*.jar" excludes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
<fileset dir="${soa.esb.lib.ext.dir}" includes="*.jar" excludes="jaxr-api*.jar,scout*.jar,juddi*.jar"/>
- <fileset dir="${org.jboss.esb.server.home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/>
+ <fileset dir="${org.jboss.as.home}/client" includes="jbossall-client.jar jbossws-client.jar mail.jar"/>
<fileset dir="${soa.esb.lib.dir}" includes="*.jar"/>
<fileset dir="${esb.lib.dir}/ext" includes="*.jar"/>
<!-- for finding the jbossesb-properties.xml file -->
@@ -81,8 +81,8 @@
<path id="esb.samples.trailblazer.esb.classpath.client">
<fileset dir="${soa.esb.lib.ext.dir}"/>
<fileset dir="${esb.lib.dir}/ext" includes="*.jar"/>
- <fileset dir="${org.jboss.esb.server.home}/client" includes="jboss-jaxrpc.jar jbossall-client.jar jbossws-client.jar mail.jar"/>
- <fileset dir="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy/jbossws.sar" includes="jboss-jaxrpc.jar"/>
+ <fileset dir="${org.jboss.as.home}/client" includes="jboss-jaxrpc.jar jbossall-client.jar jbossws-client.jar mail.jar"/>
+ <fileset dir="${org.jboss.as.home}/server/${org.jboss.as.config}/deploy/jbossws.sar" includes="jboss-jaxrpc.jar"/>
<fileset dir="${soa.esb.lib.dir}" includes="*.jar"/>
<fileset dir="${esb.samples.trailblazer.client.lib.dir}/ext" includes="*.jar"/>
<fileset dir="${esb.dest}/dist" includes="trailblazer-esb.jar"/>
@@ -95,13 +95,13 @@
</target>
<target name="messaging-config">
- <property name="org.jboss.esb.server.deploy.dir"
- value="${org.jboss.esb.server.home}/server/${org.jboss.esb.server.config}/deploy"/>
+ <property name="org.jboss.as.deploy.dir"
+ value="${org.jboss.as.home}/server/${org.jboss.as.config}/deploy"/>
<condition property="messaging.present">
- <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging"/>
+ <available file="${org.jboss.as.deploy.dir}/jboss-messaging"/>
</condition>
<condition property="messaging.present">
- <available file="${org.jboss.esb.server.deploy.dir}/jboss-messaging.sar"/>
+ <available file="${org.jboss.as.deploy.dir}/jboss-messaging.sar"/>
</condition>
<condition property="jbossmq.present">
Modified: validator/trunk/samples/jbossesb/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java
===================================================================
--- validator/trunk/samples/jbossesb/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java 2009-12-06 13:47:06 UTC (rev 113)
+++ validator/trunk/samples/jbossesb/trailblazer/esb/src/org/jboss/soa/esb/samples/trailblazer/util/TbBootStrapper.java 2009-12-06 16:23:07 UTC (rev 114)
@@ -32,7 +32,7 @@
import org.jboss.soa.esb.listeners.StandAloneBootStrapper;
import org.jboss.soa.esb.persistence.manager.ConnectionManagerFactory;
import org.jboss.soa.esb.testutils.FileUtil;
-import org.jboss.soa.esb.testutils.HsqldbUtil;
+//import org.jboss.soa.esb.testutils.HsqldbUtil;
import org.jboss.soa.esb.testutils.TestEnvironmentUtil;
public class TbBootStrapper extends StandAloneBootStrapper {
16 years, 4 months
- 1
- 0
savara SVN: r113 - in validator/trunk: distribution/src/main/assembly and 4 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2009-12-06 08:47:06 -0500 (Sun, 06 Dec 2009)
New Revision: 113
Added:
validator/trunk/jbossesb/src/main/configs/META-INF/jbm-queue-service.xml
validator/trunk/jbossesb/src/main/configs/META-INF/jboss-scanning.xml
validator/trunk/jbossesb/src/main/configs/META-INF/jboss-structure.xml
Modified:
validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties-validator.xml
validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties.xml
validator/trunk/distribution/src/main/assembly/bin.xml
validator/trunk/distribution/src/main/release/install/build.xml
validator/trunk/jbossesb/pom.xml
validator/trunk/jbossesb/src/main/configs/META-INF/deployment.xml
validator/trunk/jbossesb/src/main/configs/esb-assembly.xml
Log:
Updated validator build and installation, so that pi4soa and EMF jars are directly included in the validator.esb, rather than separate pi4soa.sar. Also updated the ESB config file that incorporates the filter to be ESB4.7 based.
Modified: validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties-validator.xml
===================================================================
--- validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties-validator.xml 2009-12-06 12:09:04 UTC (rev 112)
+++ validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties-validator.xml 2009-12-06 13:47:06 UTC (rev 113)
@@ -1,95 +1,153 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- 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 JBoss Inc.
--->
-<!-- $Id: jbossesb-unittest-properties.xml $ -->
-<!--
- These options are described in the JBossESB manual.
- Defaults are provided here for convenience only.
-
- Please read through this file prior to using the system, and consider
- updating the specified entries.
--->
-<esb
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
- <properties name="core">
- <property name="org.jboss.soa.esb.jndi.server.context.factory" value="org.jnp.interfaces.NamingContextFactory"/>
- <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.bind.address}:1099"/>
- <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
- <property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/>
- <property name="jboss.esb.invm.scope.default" value="NONE"/>
- </properties>
- <properties name="registry">
- <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.registry.local.InquiryService#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#publish"/>
- <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
- <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <property name="org.jboss.soa.esb.registry.user" value="jbossesb"/>
- <property name="org.jboss.soa.esb.registry.password" value="password"/>
- <!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
- <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
- </properties>
- <properties name="transports" depends="core">
- <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
- <property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
- <property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
- <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
- <property name="org.jboss.soa.esb.mail.smtp.auth" value="true"/>
- <property name="org.jboss.soa.esb.ftp.localdir" value="/tmp"/>
- <property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/>
- <property name="org.jboss.soa.esb.jms.connectionPool" value="20"/>
- <property name="org.jboss.soa.esb.jms.sessionSleep" value="30"/>
- </properties>
- <properties name="connection">
- <property name="min-pool-size" value="5"/>
- <property name="max-pool=size" value="10"/>
- <property name="blocking-timeout-millis" value="5000"/>
- <property name="abandoned-connection-timeout" value="10000"/>
- <property name="abandoned-connection-time-interval" value="30000"/>
- </properties>
- <properties name="dbstore">
-
- <!-- connection manager type -->
- <!-- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/> -->
- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/>
-
- <!-- this property is only used if using the j2ee connection manager -->
- <property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossESBDS"/>
-
- <!-- standalone connection pooling settings -->
- <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/>
- <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
- <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/>
- <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/>
- <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/>
- <!--table managed by pool to test for valid connections - created by pool automatically -->
- <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/>
- <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/>
-
- </properties>
- <properties name="filters">
- <property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/>
- <property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/>
- <property name="org.jboss.soa.esb.filter.10" value="org.jboss.soa.overlord.validator.jbossesb.ValidatorFilter" />
- </properties>
-</esb>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ 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 JBoss Inc.
+-->
+<!-- $Id: jbossesb-unittest-properties.xml $ -->
+<!--
+ These options are described in the JBossESB manual.
+ Defaults are provided here for convenience only.
+
+ Please read through this file prior to using the system, and consider
+ updating the specified entries.
+-->
+<esb
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
+ <properties name="core">
+ <property name="org.jboss.soa.esb.jndi.server.context.factory" value="org.jnp.interfaces.NamingContextFactory"/>
+ <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.esb.bind.address}:1099"/>
+ <property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
+ <property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/>
+ <property name="org.jboss.soa.esb.mime.text.types" value="text/*;application/xml;application/*-xml"/>
+ <property name="jboss.esb.invm.scope.default" value="NONE"/>
+ </properties>
+ <properties name="security">
+ <property name="org.jboss.soa.esb.services.security.implementationClass" value="org.jboss.internal.soa.esb.services.security.JaasSecurityService"/>
+ <property name="org.jboss.soa.esb.services.security.callbackHandler" value="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler"/>
+
+ <!-- Algorithm and key size for internal sealing of objects -->
+ <property name="org.jboss.soa.esb.services.security.sealAlgorithm" value="TripleDES"/>
+ <property name="org.jboss.soa.esb.services.security.sealKeySize" value="168"/>
+
+ <!-- Timeout in milliseconds. After which the context is considered invalid -->
+ <property name="org.jboss.soa.esb.services.security.contextTimeout" value="30000"/>
+ <property name="org.jboss.soa.esb.services.security.contextPropagatorImplementationClass" value="org.jboss.internal.soa.esb.services.security.JBossASContextPropagator"/>
+
+ <!-- Public keystore configuration used to hold keys for encryption/decryption -->
+ <property name="org.jboss.soa.esb.services.security.publicKeystore" value="/publicKeyStore"/>
+ <property name="org.jboss.soa.esb.services.security.publicKeystorePassword" value="testKeystorePassword"/>
+ <property name="org.jboss.soa.esb.services.security.publicKeyAlias" value="testAlias"/>
+ <property name="org.jboss.soa.esb.services.security.publicKeyPassword" value="testPassword"/>
+ <property name="org.jboss.soa.esb.services.security.publicKeyTransformation" value="RSA/ECB/PKCS1Padding"/>
+
+ </properties>
+ <properties name="registry">
+ <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/>
+ <property name="org.jboss.soa.esb.registry.securityManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/>
+ <property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
+ <property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
+ <property name="org.jboss.soa.esb.registry.user" value="root"/>
+ <property name="org.jboss.soa.esb.registry.password" value="root"/>
+ <!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
+ <property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/>
+
+ <!-- specify the interceptors, in order -->
+ <property name="org.jboss.soa.esb.registry.interceptors" value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor"/>
+ <!-- Example of specifying multiple registry interceptors
+ <property name="org.jboss.soa.esb.registry.interceptors"
+ value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor, org.jboss.internal.soa.esb.services.registry.CachingRegistryInterceptor"/>
+ -->
+
+ <!-- The following properties modify the cache interceptor behaviour -->
+ <property name="org.jboss.soa.esb.registry.cache.maxSize" value="100"/>
+ <property name="org.jboss.soa.esb.registry.cache.validityPeriod" value="600000"/>
+
+ <!-- Organization Category to be used by this deployment. -->
+ <property name="org.jboss.soa.esb.registry.orgCategory" value="org.jboss.soa.esb.:category"/>
+ </properties>
+ <properties name="transports" depends="core">
+ <property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
+ <property name="org.jboss.soa.esb.mail.smtp.user" value="jbossesb"/>
+ <property name="org.jboss.soa.esb.mail.smtp.password" value=""/>
+ <property name="org.jboss.soa.esb.mail.smtp.port" value="25"/>
+ <property name="org.jboss.soa.esb.mail.smtp.auth" value="true"/>
+ <property name="org.jboss.soa.esb.ftp.localdir" value="/tmp"/>
+ <property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/>
+ <property name="org.jboss.soa.esb.jms.connectionPool" value="20"/>
+ <property name="org.jboss.soa.esb.jms.sessionSleep" value="30"/>
+ <!-- expiry of messages to temporary invm destinations (default replies)
+ expire after the following timeout, specified in milliseconds (5 mins) -->
+ <property name="org.jboss.soa.esb.invm.expiryTime" value="300000"/>
+
+ <!-- Uncomment this to return stack traces when exposing an ESB service through WS
+ <property name="org.jboss.soa.esb.ws.returnStackTrace" value="true"/>
+ -->
+ <!-- Uncomment this to specify the WS response timeout when exposing an ESB service through WS
+ <property name="org.jboss.soa.esb.ws.timeout" value="30000"/>
+ -->
+ </properties>
+ <properties name="connection">
+ <property name="min-pool-size" value="5"/>
+ <property name="max-pool-size" value="10"/>
+ <property name="blocking-timeout-millis" value="5000"/>
+ <property name="abandoned-connection-timeout" value="10000"/>
+ <property name="abandoned-connection-time-interval" value="30000"/>
+ </properties>
+ <properties name="jca">
+ <property name="org.jboss.soa.esb.jca.activation.mapper.jms-ra.rar" value="org.jboss.soa.esb.listeners.jca.JBossActivationMapper"/>
+ <property name="org.jboss.soa.esb.jca.activation.mapper.wmq.jmsra.rar" value="org.jboss.soa.esb.listeners.jca.WMQActivationMapper"/>
+ </properties>
+
+ <properties name="dbstore">
+
+ <!-- connection manager type -->
+ <!-- <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.StandaloneConnectionManager"/> -->
+ <property name="org.jboss.soa.esb.persistence.db.conn.manager" value="org.jboss.internal.soa.esb.persistence.manager.J2eeConnectionManager"/>
+
+ <!-- this property is only used if using the j2ee connection manager -->
+ <property name="org.jboss.soa.esb.persistence.db.datasource.name" value="java:/JBossESBDS"/>
+
+ <!-- standalone connection pooling settings -->
+ <property name="org.jboss.soa.esb.persistence.db.connection.url" value="jdbc:hsqldb:hsql://localhost:9001/"/>
+ <property name="org.jboss.soa.esb.persistence.db.jdbc.driver" value="org.hsqldb.jdbcDriver"/>
+ <property name="org.jboss.soa.esb.persistence.db.user" value="sa"/>
+ <property name="org.jboss.soa.esb.persistence.db.pwd" value=""/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.initial.size" value="2"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.min.size" value="2"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.max.size" value="5"/>
+ <!--table managed by pool to test for valid connections - created by pool automatically -->
+ <property name="org.jboss.soa.esb.persistence.db.pool.test.table" value="pooltest"/>
+ <property name="org.jboss.soa.esb.persistence.db.pool.timeout.millis" value="5000"/>
+
+ </properties>
+ <properties name="filters">
+ <property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/>
+ <property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/>
+ <property name="org.jboss.soa.esb.filter.10" value="org.jboss.savara.validator.jbossesb.ValidatorFilter" />
+ </properties>
+
+ <properties name="rules">
+ <!-- change this to true if you wish to have the same behaviour as ESB4.6 and prior (including SOA 4.3) -->
+ <property name="org.jboss.soa.esb.services.rules.continueState" value="false"/>
+ </properties>
+</esb>
Modified: validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties.xml
===================================================================
--- validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties.xml 2009-12-06 12:09:04 UTC (rev 112)
+++ validator/trunk/distribution/src/files/jbossesb/conf/jbossesb-properties.xml 2009-12-06 13:47:06 UTC (rev 113)
@@ -32,20 +32,58 @@
xsi:noNamespaceSchemaLocation="jbossesb-1_0.xsd">
<properties name="core">
<property name="org.jboss.soa.esb.jndi.server.context.factory" value="org.jnp.interfaces.NamingContextFactory"/>
- <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.bind.address}:1099"/>
+ <property name="org.jboss.soa.esb.jndi.server.url" value="${jboss.esb.bind.address}:1099"/>
<property name="org.jboss.soa.esb.persistence.connection.factory" value="org.jboss.internal.soa.esb.persistence.format.MessageStoreFactoryImpl"/>
<property name="org.jboss.soa.esb.loadbalancer.policy" value="org.jboss.soa.esb.listeners.ha.RoundRobin"/>
+ <property name="org.jboss.soa.esb.mime.text.types" value="text/*;application/xml;application/*-xml"/>
<property name="jboss.esb.invm.scope.default" value="NONE"/>
</properties>
+ <properties name="security">
+ <property name="org.jboss.soa.esb.services.security.implementationClass" value="org.jboss.internal.soa.esb.services.security.JaasSecurityService"/>
+ <property name="org.jboss.soa.esb.services.security.callbackHandler" value="org.jboss.internal.soa.esb.services.security.UserPassCallbackHandler"/>
+
+ <!-- Algorithm and key size for internal sealing of objects -->
+ <property name="org.jboss.soa.esb.services.security.sealAlgorithm" value="TripleDES"/>
+ <property name="org.jboss.soa.esb.services.security.sealKeySize" value="168"/>
+
+ <!-- Timeout in milliseconds. After which the context is considered invalid -->
+ <property name="org.jboss.soa.esb.services.security.contextTimeout" value="30000"/>
+ <property name="org.jboss.soa.esb.services.security.contextPropagatorImplementationClass" value="org.jboss.internal.soa.esb.services.security.JBossASContextPropagator"/>
+
+ <!-- Public keystore configuration used to hold keys for encryption/decryption -->
+ <property name="org.jboss.soa.esb.services.security.publicKeystore" value="/publicKeyStore"/>
+ <property name="org.jboss.soa.esb.services.security.publicKeystorePassword" value="testKeystorePassword"/>
+ <property name="org.jboss.soa.esb.services.security.publicKeyAlias" value="testAlias"/>
+ <property name="org.jboss.soa.esb.services.security.publicKeyPassword" value="testPassword"/>
+ <property name="org.jboss.soa.esb.services.security.publicKeyTransformation" value="RSA/ECB/PKCS1Padding"/>
+
+ </properties>
<properties name="registry">
- <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.registry.local.InquiryService#inquire"/>
- <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.registry.local.PublishService#publish"/>
+ <property name="org.jboss.soa.esb.registry.queryManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService#inquire"/>
+ <property name="org.jboss.soa.esb.registry.lifeCycleManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDIPublicationService#publish"/>
+ <property name="org.jboss.soa.esb.registry.securityManagerURI" value="org.apache.juddi.v3.client.transport.wrapper.UDDISecurityService#secure"/>
<property name="org.jboss.soa.esb.registry.implementationClass" value="org.jboss.internal.soa.esb.services.registry.JAXRRegistryImpl"/>
<property name="org.jboss.soa.esb.registry.factoryClass" value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/>
- <property name="org.jboss.soa.esb.registry.user" value="jbossesb"/>
- <property name="org.jboss.soa.esb.registry.password" value="password"/>
+ <property name="org.jboss.soa.esb.registry.user" value="root"/>
+ <property name="org.jboss.soa.esb.registry.password" value="root"/>
<!-- the following parameter is scout specific to set the type of communication between scout and the UDDI (embedded, rmi, soap) -->
<property name="org.jboss.soa.esb.scout.proxy.transportClass" value="org.apache.ws.scout.transport.LocalTransport"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiVersion" value="3.0"/>
+ <property name="org.jboss.soa.esb.scout.proxy.uddiNameSpace" value="urn:uddi-org:api_v3"/>
+
+ <!-- specify the interceptors, in order -->
+ <property name="org.jboss.soa.esb.registry.interceptors" value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor"/>
+ <!-- Example of specifying multiple registry interceptors
+ <property name="org.jboss.soa.esb.registry.interceptors"
+ value="org.jboss.internal.soa.esb.services.registry.InVMRegistryInterceptor, org.jboss.internal.soa.esb.services.registry.CachingRegistryInterceptor"/>
+ -->
+
+ <!-- The following properties modify the cache interceptor behaviour -->
+ <property name="org.jboss.soa.esb.registry.cache.maxSize" value="100"/>
+ <property name="org.jboss.soa.esb.registry.cache.validityPeriod" value="600000"/>
+
+ <!-- Organization Category to be used by this deployment. -->
+ <property name="org.jboss.soa.esb.registry.orgCategory" value="org.jboss.soa.esb.:category"/>
</properties>
<properties name="transports" depends="core">
<property name="org.jboss.soa.esb.mail.smtp.host" value="localhost"/>
@@ -57,14 +95,29 @@
<property name="org.jboss.soa.esb.ftp.remotedir" value="/tmp"/>
<property name="org.jboss.soa.esb.jms.connectionPool" value="20"/>
<property name="org.jboss.soa.esb.jms.sessionSleep" value="30"/>
+ <!-- expiry of messages to temporary invm destinations (default replies)
+ expire after the following timeout, specified in milliseconds (5 mins) -->
+ <property name="org.jboss.soa.esb.invm.expiryTime" value="300000"/>
+
+ <!-- Uncomment this to return stack traces when exposing an ESB service through WS
+ <property name="org.jboss.soa.esb.ws.returnStackTrace" value="true"/>
+ -->
+ <!-- Uncomment this to specify the WS response timeout when exposing an ESB service through WS
+ <property name="org.jboss.soa.esb.ws.timeout" value="30000"/>
+ -->
</properties>
<properties name="connection">
<property name="min-pool-size" value="5"/>
- <property name="max-pool=size" value="10"/>
+ <property name="max-pool-size" value="10"/>
<property name="blocking-timeout-millis" value="5000"/>
<property name="abandoned-connection-timeout" value="10000"/>
<property name="abandoned-connection-time-interval" value="30000"/>
</properties>
+ <properties name="jca">
+ <property name="org.jboss.soa.esb.jca.activation.mapper.jms-ra.rar" value="org.jboss.soa.esb.listeners.jca.JBossActivationMapper"/>
+ <property name="org.jboss.soa.esb.jca.activation.mapper.wmq.jmsra.rar" value="org.jboss.soa.esb.listeners.jca.WMQActivationMapper"/>
+ </properties>
+
<properties name="dbstore">
<!-- connection manager type -->
@@ -91,4 +144,9 @@
<property name="org.jboss.soa.esb.filter.1" value="org.jboss.internal.soa.esb.message.filter.MetaDataFilter"/>
<property name="org.jboss.soa.esb.filter.2" value="org.jboss.internal.soa.esb.message.filter.GatewayFilter"/>
</properties>
+
+ <properties name="rules">
+ <!-- change this to true if you wish to have the same behaviour as ESB4.6 and prior (including SOA 4.3) -->
+ <property name="org.jboss.soa.esb.services.rules.continueState" value="false"/>
+ </properties>
</esb>
Modified: validator/trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- validator/trunk/distribution/src/main/assembly/bin.xml 2009-12-06 12:09:04 UTC (rev 112)
+++ validator/trunk/distribution/src/main/assembly/bin.xml 2009-12-06 13:47:06 UTC (rev 113)
@@ -43,6 +43,11 @@
<outputDirectory>/install</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>src/files/jbossesb/conf</directory>
+ <outputDirectory>/modules</outputDirectory>
+ </fileSet>
+
<!-- copy documents -->
<fileSet>
<directory>../docs/samplesguide/target/docbook/publish/en-US</directory>
Modified: validator/trunk/distribution/src/main/release/install/build.xml
===================================================================
--- validator/trunk/distribution/src/main/release/install/build.xml 2009-12-06 12:09:04 UTC (rev 112)
+++ validator/trunk/distribution/src/main/release/install/build.xml 2009-12-06 13:47:06 UTC (rev 113)
@@ -9,6 +9,7 @@
<property name="server.dir" value="${org.jboss.as.home}/server/${org.jboss.as.config}"/>
<property name="conf.dir" value="${server.dir}/conf"/>
<property name="deploy.dir" value="${server.dir}/deploy"/>
+ <property name="deployers.dir" value="${server.dir}/deployers"/>
<property name="server.lib.dir" value="${server.dir}/lib"/>
<property name="modules" value="../modules" />
@@ -24,16 +25,30 @@
<fail unless="as.configured" message="Cannot determine target deployment, please check deployment.properties"/>
</target>
- <target name="deploy" description="Deploys SAVARA Validator to the server">
- <echo message="Deploy SAVARA Validator to JBoss AS/ESB server" />
- <copy todir="${deploy.dir}/savara-validator-jbossesb.esb">
+ <target name="deploy" depends="check.deploy.props,register-validator-filter"
+ description="Deploys SAVARA Validator to the server">
+ <echo message="Deploy SAVARA Validator to JBoss AS/ESB server" />
+ <copy todir="${deploy.dir}/savara-validator-jbossesb.esb">
<fileset dir="${modules}/savara-validator-jbossesb.esb"/>
- </copy>
+ </copy>
</target>
- <target name="undeploy" description="Undeploys SAVARA Validator">
- <echo message="Undeploy the SAVARA Validator from JBoss AS/ESB server" />
- <delete dir="${deploy.dir}/savara-validator-jbossesb.esb" />
+ <target name="undeploy" depends="unregister-validator-filter" description="Undeploys SAVARA Validator">
+ <echo message="Undeploy the SAVARA Validator from JBoss AS/ESB server" />
+ <delete dir="${deploy.dir}/savara-validator-jbossesb.esb" />
</target>
+
+ <target name="register-validator-filter">
+ <echo message="register the validator filter in the jbossesb-properties file" />
+ <delete file="${deployers.dir}/esb.deployer/jbossesb-properties.xml" />
+ <copy file="${modules}/conf/jbossesb-properties-validator.xml" tofile="${deployers.dir}/esb.deployer/jbossesb-properties.xml" />
+ </target>
+
+ <target name="unregister-validator-filter">
+ <echo message="unregister the validator filter from the jbossesb-properties file" />
+ <delete file="${deployers.dir}/esb.deployer/jbossesb-properties.xml" />
+ <copy file="${modules}/conf/jbossesb-properties.xml" tofile="${deployers.dir}/esb.deployer/jbossesb-properties.xml" />
+ </target>
+
</project>
Modified: validator/trunk/jbossesb/pom.xml
===================================================================
--- validator/trunk/jbossesb/pom.xml 2009-12-06 12:09:04 UTC (rev 112)
+++ validator/trunk/jbossesb/pom.xml 2009-12-06 13:47:06 UTC (rev 113)
@@ -34,31 +34,31 @@
<groupId>org.jboss.overlord.dependencies.org.pi4soa</groupId>
<artifactId>pi4soa-common</artifactId>
<version>2.0</version>
- <scope>provided</scope>
+ <!-- >scope>provided</scope -->
</dependency>
<dependency>
<groupId>org.jboss.overlord.dependencies.org.pi4soa</groupId>
<artifactId>pi4soa-cdl</artifactId>
<version>2.0</version>
- <scope>provided</scope>
+ <!-- >scope>provided</scope -->
</dependency>
<dependency>
<groupId>org.jboss.overlord.dependencies.org.pi4soa</groupId>
<artifactId>pi4soa-service</artifactId>
<version>2.0</version>
- <scope>provided</scope>
+ <!-- >scope>provided</scope -->
</dependency>
<dependency>
<groupId>org.jboss.overlord.dependencies.org.eclipse.emf</groupId>
<artifactId>emf-common</artifactId>
<version>2.3.0</version>
- <scope>provided</scope>
+ <!-- >scope>provided</scope -->
</dependency>
<dependency>
<groupId>org.jboss.overlord.dependencies.org.eclipse.emf</groupId>
<artifactId>emf-ecore</artifactId>
<version>2.3.1</version>
- <scope>provided</scope>
+ <!-- >scope>provided</scope -->
</dependency>
</dependencies>
Modified: validator/trunk/jbossesb/src/main/configs/META-INF/deployment.xml
===================================================================
--- validator/trunk/jbossesb/src/main/configs/META-INF/deployment.xml 2009-12-06 12:09:04 UTC (rev 112)
+++ validator/trunk/jbossesb/src/main/configs/META-INF/deployment.xml 2009-12-06 13:47:06 UTC (rev 113)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<jbossesb-deployment>
<depends>jboss.esb:deployment=jbossesb.esb</depends>
- <depends>pi4soa:service=pi4soa</depends>
+ <depends>jboss.messaging.destination:service=Topic,name=tracker</depends>
</jbossesb-deployment>
Added: validator/trunk/jbossesb/src/main/configs/META-INF/jbm-queue-service.xml
===================================================================
--- validator/trunk/jbossesb/src/main/configs/META-INF/jbm-queue-service.xml (rev 0)
+++ validator/trunk/jbossesb/src/main/configs/META-INF/jbm-queue-service.xml 2009-12-06 13:47:06 UTC (rev 113)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server>
+
+ <mbean code="org.jboss.jms.server.destination.TopicService"
+ name="jboss.messaging.destination:service=Topic,name=tracker"
+ xmbean-dd="xmdesc/Topic-xmbean.xml">
+ <depends optional-attribute-name="ServerPeer">jboss.messaging:service=ServerPeer</depends>
+ <depends>jboss.messaging:service=PostOffice</depends>
+ </mbean>
+
+</server>
Added: validator/trunk/jbossesb/src/main/configs/META-INF/jboss-scanning.xml
===================================================================
--- validator/trunk/jbossesb/src/main/configs/META-INF/jboss-scanning.xml (rev 0)
+++ validator/trunk/jbossesb/src/main/configs/META-INF/jboss-scanning.xml 2009-12-06 13:47:06 UTC (rev 113)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+ <!-- prevent scanning for annotations -->
+</scanning>
Added: validator/trunk/jbossesb/src/main/configs/META-INF/jboss-structure.xml
===================================================================
--- validator/trunk/jbossesb/src/main/configs/META-INF/jboss-structure.xml (rev 0)
+++ validator/trunk/jbossesb/src/main/configs/META-INF/jboss-structure.xml 2009-12-06 13:47:06 UTC (rev 113)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<structure>
+ <context>
+ <path name=""/>
+ <metaDataPath>
+ <path name="META-INF"/>
+ </metaDataPath>
+ <classpath>
+ <path name=""/>
+ <path name="" suffixes=".jar" />
+ <path name="lib" suffixes=".jar" />
+ </classpath>
+ </context>
+</structure>
Modified: validator/trunk/jbossesb/src/main/configs/esb-assembly.xml
===================================================================
--- validator/trunk/jbossesb/src/main/configs/esb-assembly.xml 2009-12-06 12:09:04 UTC (rev 112)
+++ validator/trunk/jbossesb/src/main/configs/esb-assembly.xml 2009-12-06 13:47:06 UTC (rev 113)
@@ -17,9 +17,14 @@
<dependencySets>
<dependencySet>
- <outputDirectory>/</outputDirectory>
+ <outputDirectory>/lib</outputDirectory>
<includes>
<include>org.jboss.savara.validator:savara-validator-jbossesb</include>
+ <include>org.jboss.overlord.dependencies.org.pi4soa:pi4soa-common</include>
+ <include>org.jboss.overlord.dependencies.org.pi4soa:pi4soa-cdl</include>
+ <include>org.jboss.overlord.dependencies.org.pi4soa:pi4soa-service</include>
+ <include>org.jboss.overlord.dependencies.org.eclipse.emf:emf-common</include>
+ <include>org.jboss.overlord.dependencies.org.eclipse.emf:emf-ecore</include>
</includes>
</dependencySet>
</dependencySets>
16 years, 4 months
- 1
- 0
savara SVN: r112 - tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2009-12-06 07:09:04 -0500 (Sun, 06 Dec 2009)
New Revision: 112
Modified:
tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/DeploymentFileGenerator.java
tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBMMessagingSystem.java
Log:
SAVARA-2 - generate reply queue.
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/DeploymentFileGenerator.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/DeploymentFileGenerator.java 2009-12-06 11:30:04 UTC (rev 111)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/DeploymentFileGenerator.java 2009-12-06 12:09:04 UTC (rev 112)
@@ -70,6 +70,12 @@
buf.append("\t<depends>"+service.getCategory()+
".destination:service=Queue,name="+dest+
"</depends>\r\n");
+
+ if (service.isGateway()) {
+ buf.append("\t<depends>"+service.getCategory()+
+ ".destination:service=Queue,name="+dest+
+ "_reply</depends>\r\n");
+ }
} else {
logger.severe("Failed to find destination for JMS bus id '"+
service.getJMSBusIdRef()+"'");
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBMMessagingSystem.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBMMessagingSystem.java 2009-12-06 11:30:04 UTC (rev 111)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBMMessagingSystem.java 2009-12-06 12:09:04 UTC (rev 112)
@@ -70,6 +70,17 @@
buf.append("\t\t</depends>\r\n");
buf.append("\t\t<depends>jboss.messaging:service=PostOffice</depends>\r\n");
buf.append("\t</mbean>\r\n");
+
+ if (service.isGateway()) {
+ buf.append("\t<mbean code=\"org.jboss.jms.server.destination.QueueService\"\r\n");
+ buf.append("\t\t\tname=\""+service.getCategory()+".destination:service=Queue,name="+dest+"_reply\"\r\n");
+ buf.append("\t\t\txmbean-dd=\"xmdesc/Queue-xmbean.xml\">\r\n");
+ buf.append("\t\t<depends optional-attribute-name=\"ServerPeer\">\r\n");
+ buf.append("\t\t\tjboss.messaging:service=ServerPeer\r\n");
+ buf.append("\t\t</depends>\r\n");
+ buf.append("\t\t<depends>jboss.messaging:service=PostOffice</depends>\r\n");
+ buf.append("\t</mbean>\r\n");
+ }
} else {
logger.severe("Failed to find destination for JMS bus id '"+
service.getJMSBusIdRef()+"'");
16 years, 4 months
- 1
- 0
savara SVN: r111 - in tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb: generator and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2009-12-06 06:30:04 -0500 (Sun, 06 Dec 2009)
New Revision: 111
Removed:
tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBossMQMessagingSystem.java
Modified:
tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java
Log:
Remove JBossMQ as a messaging option, as basing on JBossAS5.1
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java 2009-12-06 00:15:35 UTC (rev 110)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/dialogs/GenerateDialog.java 2009-12-06 11:30:04 UTC (rev 111)
@@ -53,7 +53,6 @@
m_buildSystems.add(new MavenBuildSystem());
m_messagingSystems.add(new JBMMessagingSystem());
- m_messagingSystems.add(new JBossMQMessagingSystem());
initialize(m_file);
}
Deleted: tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBossMQMessagingSystem.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBossMQMessagingSystem.java 2009-12-06 00:15:35 UTC (rev 110)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.jbossesb/src/java/org/jboss/savara/tools/jbossesb/generator/JBossMQMessagingSystem.java 2009-12-06 11:30:04 UTC (rev 111)
@@ -1,84 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, 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.
- */
-package org.jboss.savara.tools.jbossesb.generator;
-
-import java.util.logging.Logger;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IJavaProject;
-import org.jboss.savara.tools.jbossesb.model.ESBLanguageModel;
-import org.jboss.savara.tools.jbossesb.model.ESBService;
-
-/**
- * This class provides the information related to the JBossMQ
- * messaging system.
- */
-public class JBossMQMessagingSystem extends MessagingSystem {
-
- private static final String JBOSSMQ_MESSAGING = "JBossMQ";
- private static final String JBOSSMQ_CONFIG_FILE = "jbmq-queue-service.xml";
-
- /**
- * The default constructor.
- */
- public JBossMQMessagingSystem() {
- super(JBOSSMQ_MESSAGING);
- }
-
- /**
- * This method returns the configuration filename.
- *
- * @return The configuration filename
- */
- public String getConfigFileName() {
- return(JBOSSMQ_CONFIG_FILE);
- }
-
- /**
- * This method returns the messaging configuration for the
- * supplied service.
- *
- * @param model The model
- * @param service The service
- * @return The messaging configuration
- */
- protected String getServiceConfig(ESBLanguageModel model,
- ESBService service) {
- StringBuffer buf=new StringBuffer();
-
- String dest=model.getJMSDefinition(service.getJMSBusIdRef());
-
- if (dest != null) {
- buf.append("\t<mbean code=\"org.jboss.mq.server.jmx.Queue\"\r\n");
- buf.append("\t\t\tname=\""+service.getCategory()+".destination:service=Queue,name="+dest+"\">\r\n");
- buf.append("\t\t<depends optional-attribute-name=\"DestinationManager\">\r\n");
- buf.append("\t\t\tjboss.mq:service=DestinationManager\r\n");
- buf.append("\t\t</depends>\r\n");
- buf.append("\t</mbean>\r\n");
- } else {
- logger.severe("Failed to find destination for JMS bus id '"+
- service.getJMSBusIdRef()+"'");
- }
-
- return(buf.toString());
- }
-
- private static Logger logger = Logger.getLogger("org.jboss.savara.tools.jbossesb.generator");
-}
16 years, 4 months
- 1
- 0
savara SVN: r110 - tools/eclipse/trunk/docs/userguide/src/main/module.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2009-12-05 19:15:35 -0500 (Sat, 05 Dec 2009)
New Revision: 110
Modified:
tools/eclipse/trunk/docs/userguide/src/main/module/overview.xml
Log:
Updated Overlord to SAVARA references.
Modified: tools/eclipse/trunk/docs/userguide/src/main/module/overview.xml
===================================================================
--- tools/eclipse/trunk/docs/userguide/src/main/module/overview.xml 2009-12-06 00:00:41 UTC (rev 109)
+++ tools/eclipse/trunk/docs/userguide/src/main/module/overview.xml 2009-12-06 00:15:35 UTC (rev 110)
@@ -5,7 +5,7 @@
<title>Overview</title>
<para>
- The CDL component of the Overlord SOA governance project aims to leverage the concept of a choreography (or conversation)
+ The SAVARA project aims to leverage the concept of a choreography (or conversation)
description to provide design-time and run-time governance of an SOA.
</para>
<para>
@@ -19,13 +19,13 @@
orchestrated service domains.
</para>
<para>
- This document will outline how the Choreography Description is being used as part of Project Overlord to provide SOA governance capabilities
+ This document will outline how the Choreography Description is being used as part of SAVARA to provide SOA governance capabilities
for each phase of the SOA lifecycle.
</para>
<para>
When a validated design has been approved by the users, it can be used to generate an initial skeleton of the implementation for each service.
- The current version of Overlord enables a skeleton implementation to be generated as a JBossESB service configuration file,
- using 'conversation aware' ESB actions. For more information on these, please see the “Conversational ESB User Guide”.
+ The current version of SAVARA enables a skeleton implementation to be generated as a WS-BPEL process or
+ JBossESB service configuration file (using 'conversation aware' ESB actions).
</para>
<section>
@@ -110,7 +110,8 @@
<para>
When a 'structured' implementation language has been used, such as WS-BPEL, jPDL or the new 'conversation aware' ESB actions,
it will be possible to infer the behaviour of the service being implemented, to compare it against the choreography description.
- Currently this has been implemented for the “conversation aware” ESB actions, and is demonstrated using the samples in this Overlord-CDL distribution.
+ Currently this has been implemented for the “conversation aware” ESB actions, and is demonstrated using
+ the samples in this SAVARA Runtime distribution.
</para>
<para>
Detecting incorrectly implemented behaviour at the earliest possible time saves on downstream costs associated with finding and fixing errors.
@@ -119,7 +120,7 @@
</para>
<para>
There are two other areas where a choreography description can be used as part of design-time governance,
- that are not currently implemented in Overlord:
+ that are not currently implemented in SAVARA:
</para>
<itemizedlist>
<listitem>
@@ -152,7 +153,7 @@
The error can also be reported to a central management capability.
</para>
<para>
- The CDL component of Overlord provides the ability to configure service validators to monitor the behaviour of individual services.
+ The SAVARA Validator provides the ability to configure service validators to monitor the behaviour of individual services.
An enhanced version of the JBossESB trailblazer example has been included, with the appropriate validator configuration, to demonstrate this mechanism.
</para>
</section>
@@ -181,25 +182,34 @@
<section>
<title> First Steps </title>
- <para>The first step will be to follow the instructions in the Getting Started Guide to install Overlord. </para>
+ <para>The first step will be to follow the instructions in the Getting Started Guide to install SAVARA. </para>
<para> Once installed, the next step should be to try out the examples in the samples folder. The examples consistent of:</para>
<itemizedlist>
<listitem>
Service Validation related examples
<para>
- The samples folder contains an enhanced version of the trailblazer example from the JBossESB, with the addition of a File Based Bank, and message content including a conversation id to enable the messages to be correlated with a specific session.
+ The samples folder contains an enhanced version of the trailblazer example from the
+ JBossESB, with the addition of a File Based Bank, and message content including a
+ conversation id to enable the messages to be correlated with a specific session.
</para>
</listitem>
<listitem>
Conversation aware ESB actions, with conformance checking against Choreography
<para>
- Two examples have been included, one simple example (purchasing) and the other more advanced (brokerage). Both relate to the business process of purchasing items. The second example introduces the concept of a broker to act on behalf of the customer, interacting with multiple potential suppliers.
+ Two examples have been included, one simple example (purchasing) and the other
+ more advanced (brokerage). Both relate to the business process of purchasing
+ items. The second example introduces the concept of a broker to act on behalf
+ of the customer, interacting with multiple potential suppliers.
</para>
<para>
- These examples show how a service implementation (built using “conversation aware ESB actions” in this case), can be continuously checked for conformance against a choreography description.
+ These examples show how a service implementation (built using “conversation
+ aware ESB actions” in this case), can be continuously checked for conformance
+ against a choreography description.
</para>
<para>
- The final step should be to review all of the documents in the docs folder to understand more about each capability, and then try using the techniques on your own project.
+ The final step should be to review all of the documents in the docs folder
+ to understand more about each capability, and then try using the techniques
+ on your own project.
</para>
</listitem>
</itemizedlist>
16 years, 4 months
- 1
- 0