savara SVN: r669 - branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-14 08:46:45 -0500 (Mon, 14 Feb 2011)
New Revision: 669
Modified:
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java
Log:
Make sure old tracker style messages are still supported, to help deal with different tool/server versions.
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java 2011-02-14 13:19:51 UTC (rev 668)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java 2011-02-14 13:46:45 UTC (rev 669)
@@ -43,8 +43,12 @@
handleTrackerRecord(new InteractionActivityProxy((InteractionActivity)act));
}
} catch(Throwable e) {
- logger.log(Level.SEVERE, "Failed to process tracker record", e);
- e.printStackTrace();
+ // Maybe a legacy 'service description' record
+ // TODO: Remove when legacy format no longer being supported
+ super.handleTrackerRecord(record);
+
+ //logger.log(Level.SEVERE, "Failed to process tracker record", e);
+ //e.printStackTrace();
}
}
15 years, 2 months
- 1
- 0
savara SVN: r668 - in branches/experimental/2.0.x: tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-14 08:19:51 -0500 (Mon, 14 Feb 2011)
New Revision: 668
Modified:
branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java
Log:
Simplify identity value.
Modified: branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java
===================================================================
--- branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java 2011-02-14 12:40:33 UTC (rev 667)
+++ branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java 2011-02-14 13:19:51 UTC (rev 668)
@@ -420,12 +420,20 @@
public void sentMessage(Send activity, Session session,
Channel channel, Message mesg) {
+ InteractionActivity ia=createInteractionActivity(activity, session, mesg);
+
+ ia.setOutbound(true);
+
+ publish(ia);
+ }
+
+ protected InteractionActivity createInteractionActivity(org.pi4soa.service.behavior.MessageActivity activity,
+ Session session, Message mesg) {
InteractionActivity ia=new InteractionActivity();
ia.setOperationName(activity.getOperationName());
ia.setFaultName(activity.getFaultName());
ia.setDestinationType(mesg.getServiceType());
- ia.setOutbound(true);
ia.setRequest(activity.getMessageDefinition().getClassification() == MessageClassification.REQUEST);
@@ -465,33 +473,36 @@
org.savara.activity.model.Context context=new org.savara.activity.model.Context();
- context.setName(cur.getName());
- context.setValue(XMLUtils.encodeXMLString(cur.getFullId()));
+ String name=null;
+ for (String token : cur.getTokens()) {
+ if (name == null) {
+ name = token;
+ } else {
+ name += ":"+token;
+ }
+ }
+ context.setName(name);
+
+ String value=null;
+
+ for (Object val : cur.getValues()) {
+ if (value == null) {
+ value = val.toString();
+ } else {
+ value += ":"+val.toString();
+ }
+ }
+
+ context.setValue(value);
+
ia.getContext().add(context);
}
}
- publish(ia);
-
- /*
-
- String channelText=getChannelText(channel);
- String messageText=getMessageText(mesg,
- activity.getMessageDefinition());
-
- String xml="<sd:"+TrackerEvent.SENT_MESSAGE+
- " "+SERVICE_INSTANCE_ID_ATTR+"=\""+
- getServiceInstanceId(session)+"\" "+
- SESSION_ID_ATTR+"=\""+
- getSessionId(session)+"\" "+TIMESTAMP_ATTR+"=\""+
- System.currentTimeMillis()+"\" >"+messageText+
- channelText+"</sd:"+TrackerEvent.SENT_MESSAGE+">";
-
- record(getServiceName(session), session, xml, INFO, null);
- */
+ return(ia);
}
-
+
/**
* This method registers the fact that a message has been
* sent from a stateless service.
@@ -500,16 +511,6 @@
* @param mesg The message that has been handled
*/
public void sentMessage(MessageDefinition defn, Message mesg) {
- String messageText=getMessageText(mesg, defn);
- String serviceName=getServiceName(defn);
-
- String xml="<sd:"+TrackerEvent.SENT_MESSAGE+" "+
- //SESSION_ID_ATTR+"=\""+serviceName+"\" "+
- TIMESTAMP_ATTR+"=\""+
- System.currentTimeMillis()+"\" >"+messageText+
- "</sd:"+TrackerEvent.SENT_MESSAGE+">";
-
- record(serviceName, null, xml, INFO, null);
}
/**
@@ -523,45 +524,11 @@
*/
public void receivedMessage(Receive activity, Session session,
Channel channel, Message mesg) {
- InteractionActivity ia=new InteractionActivity();
+ InteractionActivity ia=createInteractionActivity(activity, session, mesg);
- ia.setOperationName(activity.getOperationName());
- ia.setFaultName(activity.getFaultName());
- ia.setDestinationType(mesg.getServiceType());
ia.setOutbound(false);
- ia.setRequest(activity.getMessageDefinition().getClassification() == MessageClassification.REQUEST);
-
- MessageParameter mp=new MessageParameter();
- mp.setType(mesg.getType());
- mp.setValue(getMessagePayload(mesg));
-
- ia.getParameter().add(mp);
-
- ProtocolAnalysis pa=new ProtocolAnalysis();
- pa.setExpected(Boolean.TRUE);
- pa.setProtocol(activity.getServiceDescription().getFullyQualifiedName());
- pa.setRole(activity.getServiceDescription().getName());
-
- ia.getAnalysis().add(pa);
-
publish(ia);
-
- /*
- String channelText=getChannelText(channel);
- String messageText=getMessageText(mesg,
- activity.getMessageDefinition());
-
- String xml="<sd:"+TrackerEvent.RECEIVED_MESSAGE+
- " "+SERVICE_INSTANCE_ID_ATTR+"=\""+
- getServiceInstanceId(session)+"\" "+
- SESSION_ID_ATTR+"=\""+
- getSessionId(session)+"\" "+TIMESTAMP_ATTR+"=\""+
- System.currentTimeMillis()+"\" >"+messageText+
- channelText+"</sd:"+TrackerEvent.RECEIVED_MESSAGE+">";
-
- record(getServiceName(session), session, xml, INFO, null);
- */
}
/**
@@ -572,16 +539,6 @@
* @param mesg The message that has been handled
*/
public void receivedMessage(MessageDefinition defn, Message mesg) {
- String messageText=getMessageText(mesg, defn);
- String serviceName=getServiceName(defn);
-
- String xml="<sd:"+TrackerEvent.RECEIVED_MESSAGE+" "+
- //SESSION_ID_ATTR+"=\""+serviceName+"\" "+
- TIMESTAMP_ATTR+"=\""+
- System.currentTimeMillis()+"\" >"+messageText+
- "</sd:"+TrackerEvent.RECEIVED_MESSAGE+">";
-
- record(serviceName, null, xml, INFO, null);
}
/**
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java 2011-02-14 12:40:33 UTC (rev 667)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java 2011-02-14 13:19:51 UTC (rev 668)
@@ -82,8 +82,11 @@
public List<Identity> getPrimaryIdentities() {
List<Identity> ret=new java.util.Vector<Identity>();
- for (Context context : m_activity.getContext()) {
- ret.add(new Identity(context.getName(), context.getValue()));
+ for (Context context : m_activity.getContext()) {
+ String[] tokens=context.getName().split(":");
+ String[] values=context.getValue().split(":");
+
+ ret.add(new Identity(context.getName(), tokens, values));
}
return(ret);
15 years, 2 months
- 1
- 0
savara SVN: r667 - in branches/experimental/2.0.x: bundles/org.savara.activity/src/main/java/org/savara/activity/util and 5 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-14 07:40:33 -0500 (Mon, 14 Feb 2011)
New Revision: 667
Added:
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.activity/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/ActivityModelUtil.java
branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/TxnMonitor.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/eclipse/MonitorLauncher.java
Log:
Update to enable swing based monitor UI to interpret the activity model events.
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/META-INF/MANIFEST.MF 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/META-INF/MANIFEST.MF 2011-02-14 12:40:33 UTC (rev 667)
@@ -7,3 +7,7 @@
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
+Export-Package: org.savara.activity,
+ org.savara.activity.model,
+ org.savara.activity.util
+Bundle-ClassPath: .
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/ActivityModelUtil.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/ActivityModelUtil.java 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/ActivityModelUtil.java 2011-02-14 12:40:33 UTC (rev 667)
@@ -32,7 +32,7 @@
Activity ret=null;
try {
- JAXBContext context = JAXBContext.newInstance("org.savara.scenario.model",
+ JAXBContext context = JAXBContext.newInstance("org.savara.activity.model",
ActivityModelUtil.class.getClassLoader());
Unmarshaller unmarshaller = context.createUnmarshaller();
Modified: branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java
===================================================================
--- branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java 2011-02-14 12:40:33 UTC (rev 667)
@@ -59,12 +59,12 @@
import org.pi4soa.service.behavior.Send;
import org.pi4soa.service.behavior.ServiceDescription;
import org.pi4soa.service.session.Session;
-import org.pi4soa.service.tracker.PublishingServiceTracker;
import org.pi4soa.service.tracker.ServiceTracker;
import org.pi4soa.service.tracker.TrackerEvent;
import org.savara.activity.model.Activity;
import org.savara.activity.model.InteractionActivity;
import org.savara.activity.model.MessageParameter;
+import org.savara.activity.model.ProtocolAnalysis;
import org.savara.activity.util.ActivityModelUtil;
/**
@@ -434,7 +434,15 @@
mp.setValue(getMessagePayload(mesg));
ia.getParameter().add(mp);
+
+ ProtocolAnalysis pa=new ProtocolAnalysis();
+ pa.setExpected(Boolean.TRUE);
+ pa.setProtocol(activity.getServiceDescription().getFullyQualifiedName());
+ pa.setRole(XMLUtils.getLocalname(activity.getServiceDescription().getName()));
+
+ ia.getAnalysis().add(pa);
+
// Add context information from the identities info
java.util.Iterator<Identity> ids=null;
@@ -530,6 +538,13 @@
ia.getParameter().add(mp);
+ ProtocolAnalysis pa=new ProtocolAnalysis();
+ pa.setExpected(Boolean.TRUE);
+ pa.setProtocol(activity.getServiceDescription().getFullyQualifiedName());
+ pa.setRole(activity.getServiceDescription().getName());
+
+ ia.getAnalysis().add(pa);
+
publish(ia);
/*
@@ -1043,8 +1058,9 @@
}
if (value != null) {
- ret = "<sd:"+VALUE_NODE+">"+value.toString()+
- "</sd:"+VALUE_NODE+">";
+ //ret = "<sd:"+VALUE_NODE+">"+value.toString()+
+ // "</sd:"+VALUE_NODE+">";
+ ret = value.toString();
}
}
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/META-INF/MANIFEST.MF 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/META-INF/MANIFEST.MF 2011-02-14 12:40:33 UTC (rev 667)
@@ -24,7 +24,8 @@
org.pi4soa.common,
org.eclipse.wst.server.core,
org.eclipse.jst.server.core,
- org.eclipse.jst.server.generic.core
+ org.eclipse.jst.server.generic.core,
+ org.savara.activity
Eclipse-LazyStart: true
Bundle-ClassPath: .
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/pom.xml 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/pom.xml 2011-02-14 12:40:33 UTC (rev 667)
@@ -13,4 +13,12 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
+ <dependencies>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.activity</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+
</project>
Added: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java (rev 0)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/ServiceTrackerClient.java 2011-02-14 12:40:33 UTC (rev 667)
@@ -0,0 +1,185 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, 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.savara.tools.monitor;
+
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.pi4soa.service.Channel;
+import org.pi4soa.service.DefaultMessage;
+import org.pi4soa.service.Identity;
+import org.pi4soa.service.Message;
+import org.pi4soa.service.tracker.*;
+import org.savara.activity.model.*;
+import org.savara.activity.util.*;
+
+public class ServiceTrackerClient extends org.pi4soa.service.tracker.jms.JMSServiceTrackerClient {
+
+ private static Logger logger=Logger.getLogger(ServiceTrackerClient.class.getName());
+
+ public void handleTrackerRecord(String record) {
+ try {
+ Activity act=ActivityModelUtil.deserialize(new java.io.ByteArrayInputStream(record.getBytes()));
+
+ logger.fine("Activity="+act);
+
+ if (act instanceof InteractionActivity) {
+ handleTrackerRecord(new InteractionActivityProxy((InteractionActivity)act));
+ }
+ } catch(Throwable e) {
+ logger.log(Level.SEVERE, "Failed to process tracker record", e);
+ e.printStackTrace();
+ }
+ }
+
+ public class InteractionActivityProxy implements TrackerRecord, TrackerEvent {
+
+ private InteractionActivity m_activity=null;
+
+ public InteractionActivityProxy(InteractionActivity ia) {
+ m_activity = ia;
+ }
+
+ public String getServiceDescriptionName() {
+ String ret=null;
+
+ for (Analysis a : m_activity.getAnalysis()) {
+ if (a instanceof ProtocolAnalysis) {
+ ret = ((ProtocolAnalysis)a).getProtocol();
+ break;
+ }
+ }
+
+ return(ret);
+ }
+
+ public String getServiceDescriptionVersion() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Identity getSessionIdentity() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public List<Identity> getPrimaryIdentities() {
+ List<Identity> ret=new java.util.Vector<Identity>();
+
+ for (Context context : m_activity.getContext()) {
+ ret.add(new Identity(context.getName(), context.getValue()));
+ }
+
+ return(ret);
+ }
+
+ public TrackerEvent[] getTrackerEvents() {
+ return(new TrackerEvent[]{this});
+ }
+
+ public String toXML() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getEventType() {
+ String ret=null;
+
+ // TODO: Need to check if message was expected, otherwise
+ // should return 'unexpected message' type
+ if (m_activity.isOutbound()) {
+ ret = TrackerEvent.SENT_MESSAGE;
+ } else {
+ ret = TrackerEvent.RECEIVED_MESSAGE;
+ }
+
+ return(ret);
+ }
+
+ public String getName() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getServiceInstanceId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getSessionId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getLocalSessionId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getLocalParentSessionId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getParentSessionId() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public long getTimestamp() {
+ // TODO Auto-generated method stub
+ return 0;
+ }
+
+ public Message getMessage() {
+ DefaultMessage ret=new DefaultMessage();
+
+ ret.setMessageIdentities(getPrimaryIdentities());
+ ret.setOperationName(m_activity.getOperationName());
+ ret.setFaultName(m_activity.getFaultName());
+ ret.setServiceType(m_activity.getDestinationType());
+
+ if (m_activity.getParameter().size() > 0) {
+ ret.setType(m_activity.getParameter().get(0).getType());
+ ret.setValue(m_activity.getParameter().get(0).getValue());
+ }
+
+ return(ret);
+ }
+
+ public Channel getChannel() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public String getDetails() {
+ // Only return first value, if parameter defined
+ if (m_activity.getParameter().size() > 0) {
+ return(m_activity.getParameter().get(0).getValue());
+ }
+ return(null);
+ }
+
+ public String getException() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ }
+}
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/TxnMonitor.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/TxnMonitor.java 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/TxnMonitor.java 2011-02-14 12:40:33 UTC (rev 667)
@@ -29,7 +29,6 @@
import org.pi4soa.service.correlator.ServiceCorrelator;
import org.pi4soa.service.correlator.ServiceCorrelatorFactory;
import org.pi4soa.service.correlator.ServiceCorrelatorListener;
-import org.pi4soa.service.tracker.ServiceTrackerClient;
import org.pi4soa.service.tracker.jms.JMSServiceTrackerClient;
/**
@@ -53,7 +52,7 @@
m_correlator.addServiceCorrelatorListener(new CorrelatorListener());
// Obtain service tracker client
- m_trackerClient = new JMSServiceTrackerClient();
+ m_trackerClient = new ServiceTrackerClient();
// Check if system properties have been provided for JNDI
if (System.getProperty("java.naming.factory.initial") != null) {
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/eclipse/MonitorLauncher.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/eclipse/MonitorLauncher.java 2011-02-13 08:59:02 UTC (rev 666)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/src/java/org/savara/tools/monitor/eclipse/MonitorLauncher.java 2011-02-14 12:40:33 UTC (rev 667)
@@ -361,6 +361,7 @@
}
buildClassPath("org.savara.tools.monitor", classpathEntries);
+ buildClassPath("org.savara.activity", classpathEntries);
buildClassPath("org.pi4soa.service", classpathEntries);
buildClassPath("org.pi4soa.common", classpathEntries);
buildClassPath("org.pi4soa.cdl", classpathEntries);
@@ -447,6 +448,14 @@
path = baseLocation+"classes";
entries.add(path);
+ } else if ((new File(baseLocation+"bin")).exists()) {
+ path = baseLocation+"bin";
+
+ entries.add(path);
+ } else if ((new File(baseLocation+"target/classes")).exists()) {
+ path = baseLocation+"target/classes";
+
+ entries.add(path);
}
}
}
15 years, 2 months
- 1
- 0
savara SVN: r666 - in branches/experimental/2.0.x: bundles/org.savara.activity/src/main/java/org/savara/activity and 6 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-13 03:59:02 -0500 (Sun, 13 Feb 2011)
New Revision: 666
Added:
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/ActivityModelUtil.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ComponentActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Context.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InteractionActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageParameter.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Status.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java
branches/experimental/2.0.x/docs/pom.xml
branches/experimental/2.0.x/integration/jboss/common/.classpath
branches/experimental/2.0.x/integration/jboss/common/pom.xml
branches/experimental/2.0.x/integration/jboss/common/src/main/configs/common-assembly.xml
branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java
Log:
Update service validator mechanism to use new activity event.
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-02-13 08:59:02 UTC (rev 666)
@@ -43,7 +43,7 @@
<complexContent>
<extension base="tns:Activity">
<sequence>
- <element name="parameter" type="tns:MessageParameter"></element>
+ <element name="parameter" type="tns:MessageParameter" maxOccurs="unbounded" minOccurs="0"></element>
</sequence>
<attribute name="destinationType" type="string"></attribute>
<attribute name="destinationAddress" type="string"></attribute>
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 2011-02-13 08:59:02 UTC (rev 666)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.02.11 at 03:55:15 PM GMT
+// Generated on: 2011.02.12 at 11:24:50 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-02-13 08:59:02 UTC (rev 666)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.02.11 at 03:55:15 PM GMT
+// Generated on: 2011.02.12 at 11:24:50 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ComponentActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ComponentActivity.java 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ComponentActivity.java 2011-02-13 08:59:02 UTC (rev 666)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.02.11 at 03:55:15 PM GMT
+// Generated on: 2011.02.12 at 11:24:50 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Context.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Context.java 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Context.java 2011-02-13 08:59:02 UTC (rev 666)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.02.11 at 03:55:15 PM GMT
+// Generated on: 2011.02.12 at 11:24:50 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InteractionActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InteractionActivity.java 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InteractionActivity.java 2011-02-13 08:59:02 UTC (rev 666)
@@ -2,16 +2,17 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.02.11 at 03:55:15 PM GMT
+// Generated on: 2011.02.12 at 11:24:50 PM GMT
//
package org.savara.activity.model;
+import java.util.ArrayList;
+import java.util.List;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
@@ -25,7 +26,7 @@
* <complexContent>
* <extension base="{http://www.savara.org/activity}Activity">
* <sequence>
- * <element name="parameter" type="{http://www.savara.org/activity}MessageParameter"/>
+ * <element name="parameter" type="{http://www.savara.org/activity}MessageParameter" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* <attribute name="destinationType" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="destinationAddress" type="{http://www.w3.org/2001/XMLSchema}string" />
@@ -49,8 +50,7 @@
extends Activity
{
- @XmlElement(required = true)
- protected MessageParameter parameter;
+ protected List<MessageParameter> parameter;
@XmlAttribute
protected String destinationType;
@XmlAttribute
@@ -69,25 +69,30 @@
/**
* Gets the value of the parameter property.
*
- * @return
- * possible object is
- * {@link MessageParameter }
- *
- */
- public MessageParameter getParameter() {
- return parameter;
- }
-
- /**
- * Sets the value of the parameter property.
+ * <p>
+ * This accessor method returns a reference to the live list,
+ * not a snapshot. Therefore any modification you make to the
+ * returned list will be present inside the JAXB object.
+ * This is why there is not a <CODE>set</CODE> method for the parameter property.
*
- * @param value
- * allowed object is
- * {@link MessageParameter }
- *
+ * <p>
+ * For example, to add a new item, do as follows:
+ * <pre>
+ * getParameter().add(newItem);
+ * </pre>
+ *
+ *
+ * <p>
+ * Objects of the following type(s) are allowed in the list
+ * {@link MessageParameter }
+ *
+ *
*/
- public void setParameter(MessageParameter value) {
- this.parameter = value;
+ public List<MessageParameter> getParameter() {
+ if (parameter == null) {
+ parameter = new ArrayList<MessageParameter>();
+ }
+ return this.parameter;
}
/**
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageParameter.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageParameter.java 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageParameter.java 2011-02-13 08:59:02 UTC (rev 666)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.02.11 at 03:55:15 PM GMT
+// Generated on: 2011.02.12 at 11:24:50 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-02-13 08:59:02 UTC (rev 666)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.02.11 at 03:55:15 PM GMT
+// Generated on: 2011.02.12 at 11:24:50 PM GMT
//
@@ -49,14 +49,6 @@
}
/**
- * Create an instance of {@link Context }
- *
- */
- public Context createContext() {
- return new Context();
- }
-
- /**
* Create an instance of {@link InteractionActivity }
*
*/
@@ -89,6 +81,14 @@
}
/**
+ * Create an instance of {@link Context }
+ *
+ */
+ public Context createContext() {
+ return new Context();
+ }
+
+ /**
* Create an instance of {@link JAXBElement }{@code <}{@link Activity }{@code >}}
*
*/
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-02-13 08:59:02 UTC (rev 666)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.02.11 at 03:55:15 PM GMT
+// Generated on: 2011.02.12 at 11:24:50 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Status.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Status.java 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Status.java 2011-02-13 08:59:02 UTC (rev 666)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.02.11 at 03:55:15 PM GMT
+// Generated on: 2011.02.12 at 11:24:50 PM GMT
//
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-02-13 08:59:02 UTC (rev 666)
@@ -2,7 +2,7 @@
// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.02.11 at 03:55:15 PM GMT
+// Generated on: 2011.02.12 at 11:24:50 PM GMT
//
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/activity", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/ActivityModelUtil.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/ActivityModelUtil.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/util/ActivityModelUtil.java 2011-02-13 08:59:02 UTC (rev 666)
@@ -0,0 +1,69 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, 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.savara.activity.util;
+
+import java.io.IOException;
+
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.Marshaller;
+import javax.xml.bind.Unmarshaller;
+
+import org.savara.activity.model.Activity;
+
+public class ActivityModelUtil {
+
+ public static Activity deserialize(java.io.InputStream is) throws IOException {
+ Activity ret=null;
+
+ try {
+ JAXBContext context = JAXBContext.newInstance("org.savara.scenario.model",
+ ActivityModelUtil.class.getClassLoader());
+ Unmarshaller unmarshaller = context.createUnmarshaller();
+
+ //note: setting schema to null will turn validator off
+ //unmarshaller.setSchema(null);
+ Object xmlObject = unmarshaller.unmarshal(is);
+
+ if (xmlObject instanceof JAXBElement) {
+ ret = (Activity)((JAXBElement<?>)xmlObject).getValue();
+ }
+
+ } catch(Exception e) {
+ throw new IOException("Failed to deserialize activity", e);
+ }
+
+ return(ret);
+ }
+
+ public static void serialize(Activity activity, java.io.OutputStream os) throws IOException {
+
+ try {
+ org.savara.activity.model.ObjectFactory factory=
+ new org.savara.activity.model.ObjectFactory();
+
+ JAXBContext context = JAXBContext.newInstance(Activity.class);
+ Marshaller marshaller = context.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+
+ marshaller.marshal(factory.createActivity(activity), os);
+ } catch(Exception e) {
+ throw new IOException("Failed to serialize activity", e);
+ }
+ }
+}
Modified: branches/experimental/2.0.x/docs/pom.xml
===================================================================
--- branches/experimental/2.0.x/docs/pom.xml 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/docs/pom.xml 2011-02-13 08:59:02 UTC (rev 666)
@@ -16,11 +16,16 @@
<version>2.0.0-SNAPSHOT</version>
</parent>
- <modules>
- <module>userguide</module>
- <module>gettingstartedguide</module>
- <module>samplesguide</module>
- </modules>
+ <profiles>
+ <profile>
+ <id>docs</id>
+ <modules>
+ <module>userguide</module>
+ <module>gettingstartedguide</module>
+ <module>samplesguide</module>
+ </modules>
+ </profile>
+ </profiles>
<pluginRepositories>
<pluginRepository>
Modified: branches/experimental/2.0.x/integration/jboss/common/.classpath
===================================================================
--- branches/experimental/2.0.x/integration/jboss/common/.classpath 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/integration/jboss/common/.classpath 2011-02-13 08:59:02 UTC (rev 666)
@@ -1,182 +1,184 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/security/jaas/1.0.01/jaas-1.0.01.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/security/jacc/1.0/jacc-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-avalon/avalon-framework/4.1.5/avalon-framework-4.1.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/bcel/bcel/5.1/bcel-5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/1.3.0/bsh-1.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1.3/cglib-2.1.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss.jar"/>
- <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar"/>
- <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/savara/dependencies/eclipse/emf-common/2.3.0/emf-common-2.3.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/savara/dependencies/eclipse/emf-ecore/2.3.1/emf-ecore-2.3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/savara/dependencies/eclipse/emf-ecore-xmi/2.3.1/emf-ecore-xmi-2.3.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.12-brew/getopt-1.0.12-brew.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jacorb/jacorb/2.3.0jboss.patch6-brew/jacorb-2.3.0jboss.patch6-brew.jar"/>
- <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9-brew/jaxb-api-2.1.9-brew.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.1.1.GA/jboss-aop-2.1.1.GA-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.1.1.GA/jboss-aop-2.1.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-asintegration-core/2.1.1.GA/jboss-aop-asintegration-core-2.1.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-asintegration-jmx/2.1.1.GA/jboss-aop-asintegration-jmx-2.1.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-asintegration-mc/2.1.1.GA/jboss-aop-asintegration-mc-2.1.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-aspects/2.1.1.GA/jboss-aop-aspects-2.1.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.6.GA/jboss-aop-mc-int-2.0.6.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-aspects/5.1.0.GA/jboss-as-aspects-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-cluster/5.1.0.GA/jboss-as-cluster-5.1.0.GA-jboss-ha-legacy-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-cluster/5.1.0.GA/jboss-as-cluster-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-connector/5.1.0.GA/jboss-as-connector-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-deployment/5.1.0.GA/jboss-as-deployment-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-ejb3/5.1.0.GA/jboss-as-ejb3-5.1.0.GA-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-iiop/5.1.0.GA/jboss-as-iiop-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-iiop/5.1.0.GA/jboss-as-iiop-5.1.0.GA-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-tests.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.1.0.GA/jboss-as-main-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.1.0.GA/jboss-as-main-5.1.0.GA-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-management/5.1.0.GA/jboss-as-management-5.1.0.GA-jsr77-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-profileservice/5.1.0.GA/jboss-as-profileservice-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-security/5.1.0.GA/jboss-as-security-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.1.0.GA/jboss-as-server-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.1.0.GA/jboss-as-server-5.1.0.GA-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.1.0.GA/jboss-as-server-5.1.0.GA-jmx-invoker-adaptor-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.GA/jboss-classloader-2.0.6.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.GA/jboss-classloading-2.0.6.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.GA/jboss-classloading-spi-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.GA/jboss-classloading-vfs-2.0.6.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-corba-ots-spi/5.1.0.GA/jboss-corba-ots-spi-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-current-invocation-aspects/1.0.0.CR1/jboss-current-invocation-aspects-1.0.0.CR1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.6.GA/jboss-dependency-2.0.6.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.7.GA/jboss-deployers-client-2.0.7.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.7.GA/jboss-deployers-client-spi-2.0.7.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.7.GA/jboss-deployers-core-2.0.7.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.7.GA/jboss-deployers-core-spi-2.0.7.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.7.GA/jboss-deployers-impl-2.0.7.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.7.GA/jboss-deployers-spi-2.0.7.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.7.GA/jboss-deployers-structure-spi-2.0.7.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.7.GA/jboss-deployers-vfs-2.0.7.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.7.GA/jboss-deployers-vfs-spi-2.0.7.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-deployment-spi/5.1.0.GA/jboss-deployment-spi-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.GA/jboss-ejb-api-3.0.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-as-int/1.1.5/jboss-ejb3-as-int-1.1.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-cache/1.0.0/jboss-ejb3-cache-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-core/1.1.5/jboss-ejb3-core-1.1.5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-core/1.1.5/jboss-ejb3-core-1.1.5-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-deployers/1.0.0/jboss-ejb3-deployers-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-endpoint/0.1.0/jboss-ejb3-endpoint-0.1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api-impl/1.0.0/jboss-ejb3-ext-api-impl-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-interceptors/1.0.2/jboss-ejb3-interceptors-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-mc-int/1.0.1/jboss-ejb3-mc-int-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-metadata/1.0.0/jboss-ejb3-metadata-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-clustered/1.0.1/jboss-ejb3-proxy-clustered-1.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-clustered/1.0.1/jboss-ejb3-proxy-clustered-1.0.1-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-impl/1.0.2/jboss-ejb3-proxy-impl-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-impl/1.0.2/jboss-ejb3-proxy-impl-1.0.2-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-spi/1.0.0/jboss-ejb3-proxy-spi-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-spi/1.0.0/jboss-ejb3-proxy-spi-1.0.0-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-security/1.0.0/jboss-ejb3-security-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-security/1.0.0/jboss-ejb3-security-1.0.0-client.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-timerservice-spi/1.0.0/jboss-ejb3-timerservice-spi-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-transactions/1.0.0/jboss-ejb3-transactions-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cluster/jboss-ha-client/1.1.1.GA/jboss-ha-client-1.1.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cluster/jboss-ha-server-api/1.1.1.GA/jboss-ha-server-api-1.1.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cluster/jboss-ha-server-cache-jbc/2.0.0.GA/jboss-ha-server-cache-jbc-2.0.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cluster/jboss-ha-server-cache-spi/2.0.0.GA/jboss-ha-server-cache-spi-2.0.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-integration/5.1.0.GA/jboss-integration-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.GA_SP1/jboss-jacc-api-1.1.0.GA_SP1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jad-api/1.2.0.GA/jboss-jad-api-1.2.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.GA/jboss-jaspi-api-1.0.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-javaee/5.0.1.GA/jboss-javaee-5.0.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.GA/jboss-jca-api-1.5.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-jca-spi/5.0.3.GA/jboss-jca-spi-5.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.GA/jboss-jms-api-1.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jpa/jboss-jpa-deployers/1.0.0/jboss-jpa-deployers-1.0.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.6.GA/jboss-kernel-2.0.6.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logbridge/jboss-logbridge/1.0.0.GA/jboss-logbridge-1.0.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-jdk/2.1.0.GA/jboss-logging-jdk-2.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/logmanager/jboss-logmanager/1.0.0.GA/jboss-logmanager-1.0.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.0.CR8/jboss-managed-2.1.0.CR8.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/messaging/jboss-messaging/1.4.3.GA/jboss-messaging-1.4.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.1.GA/jboss-metadata-1.0.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.SP1/jboss-metatype-2.1.0.SP1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/remoting/jboss-remoting/2.5.1/jboss-remoting-2.5.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-remoting-aspects/1.0.2/jboss-remoting-aspects-1.0.2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-security-aspects/1.0.0.GA/jboss-security-aspects-1.0.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.3.SP1/jboss-security-spi-2.0.3.SP1.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/jboss-serialization/1.0.3.GA/jboss-serialization-1.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/1.0.2.GA/jboss-server-manager-1.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-transaction-aspects/1.0.0.GA/jboss-transaction-aspects-1.0.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.1.0.GA/jboss-transaction-spi-5.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.2.GA/jboss-vfs-2.1.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/3.1.0.GA/jbosscache-core-3.1.0.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx/2.0.3.SP1/jbosssx-2.0.3.SP1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-client/2.0.3.SP1/jbosssx-client-2.0.3.SP1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxrpc/3.0.4.GA/jbossws-native-jaxrpc-3.0.4.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxws/3.1.2.GA/jbossws-native-jaxws-3.1.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.1.2.GA/jbossws-native-saaj-3.1.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.0.3.GA/jbossws-spi-1.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3/jbossxacml-2.0.3.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.6.10.GA/jgroups-2.6.10.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnp-client/5.0.3.GA/jnp-client-5.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnpserver/5.0.3.GA/jnpserver-5.0.3.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jpl-util/jpl-util/1.0/jpl-util-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/sun-jaxws/jsr181-api/2.1.1/jsr181-api-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/pi4soa/org.pi4soa.cdl/3.1.0.Final/org.pi4soa.cdl-3.1.0.Final.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/pi4soa/org.pi4soa.common/3.1.0.Final/org.pi4soa.common-3.1.0.Final.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/pi4soa/org.pi4soa.service/3.1.0.Final/org.pi4soa.service-3.1.0.Final.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/aop/pluggable-instrumentor/2.1.1.GA/pluggable-instrumentor-2.1.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.6.0/quartz-1.6.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/jboss/web/servlet-api/2.1.1.GA/servlet-api-2.1.1.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/jboss/slf4j/slf4j-jboss-logging/1.0.2.GA/slf4j-jboss-logging-1.0.2.GA.jar"/>
- <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="var" path="M2_REPO/javax/activation/activation/1.1.1/activation-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/security/jaas/1.0.01/jaas-1.0.01.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/security/jacc/1.0/jacc-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/transaction/jta/1.1/jta-1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/mail/mail/1.4/mail-1.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant/1.7.0/ant-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-junit/1.7.0/ant-junit-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/antlr/antlr/2.7.6/antlr-2.7.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-avalon/avalon-framework/4.1.5/avalon-framework-4.1.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/bcel/bcel/5.1/bcel-5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/beanshell/bsh/1.3.0/bsh-1.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/cglib/cglib/2.1.3/cglib-2.1.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.0.jboss/commons-logging-1.1.0.jboss.jar"/>
+ <classpathentry kind="var" path="M2_REPO/oswego-concurrent/concurrent/1.3.4-jboss-update1/concurrent-1.3.4-jboss-update1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/dom4j/dom4j/1.6.1/dom4j-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wutka-dtdparser/dtdparser121/1.2.1/dtdparser121-1.2.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/ejb3-persistence/1.0.2.GA/ejb3-persistence-1.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/savara/dependencies/eclipse/emf-common/2.3.0/emf-common-2.3.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/savara/dependencies/eclipse/emf-ecore/2.3.1/emf-ecore-2.3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/savara/dependencies/eclipse/emf-ecore-xmi/2.3.1/emf-ecore-xmi-2.3.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/gnu-getopt/getopt/1.0.12-brew/getopt-1.0.12-brew.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-annotations/3.4.0.GA/hibernate-annotations-3.4.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-commons-annotations/3.1.0.GA/hibernate-commons-annotations-3.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-core/3.3.0.SP1/hibernate-core-3.3.0.SP1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hibernate/hibernate-entitymanager/3.4.0.GA/hibernate-entitymanager-3.4.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jacorb/jacorb/2.3.0jboss.patch6-brew/jacorb-2.3.0jboss.patch6-brew.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javassist/javassist/3.10.0.GA/javassist-3.10.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9-brew/jaxb-api-2.1.9-brew.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.1.1.GA/jboss-aop-2.1.1.GA-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop/2.1.1.GA/jboss-aop-2.1.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-asintegration-core/2.1.1.GA/jboss-aop-asintegration-core-2.1.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-asintegration-jmx/2.1.1.GA/jboss-aop-asintegration-jmx-2.1.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-asintegration-mc/2.1.1.GA/jboss-aop-asintegration-mc-2.1.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/jboss-aop-aspects/2.1.1.GA/jboss-aop-aspects-2.1.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-aop-mc-int/2.0.6.GA/jboss-aop-mc-int-2.0.6.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-aspects/5.1.0.GA/jboss-as-aspects-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-cluster/5.1.0.GA/jboss-as-cluster-5.1.0.GA-jboss-ha-legacy-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-cluster/5.1.0.GA/jboss-as-cluster-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-connector/5.1.0.GA/jboss-as-connector-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-deployment/5.1.0.GA/jboss-as-deployment-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-ejb3/5.1.0.GA/jboss-as-ejb3-5.1.0.GA-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-iiop/5.1.0.GA/jboss-as-iiop-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-iiop/5.1.0.GA/jboss-as-iiop-5.1.0.GA-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-j2se/5.1.0.GA/jboss-as-j2se-5.1.0.GA-tests.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-jmx/5.1.0.GA/jboss-as-jmx-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.1.0.GA/jboss-as-main-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-main/5.1.0.GA/jboss-as-main-5.1.0.GA-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-management/5.1.0.GA/jboss-as-management-5.1.0.GA-jsr77-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-mbeans/5.1.0.GA/jboss-as-mbeans-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-profileservice/5.1.0.GA/jboss-as-profileservice-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-security/5.1.0.GA/jboss-as-security-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.1.0.GA/jboss-as-server-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.1.0.GA/jboss-as-server-5.1.0.GA-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-server/5.1.0.GA/jboss-as-server-5.1.0.GA-jmx-invoker-adaptor-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system/5.1.0.GA/jboss-as-system-5.1.0.GA-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-as-system-jmx/5.1.0.GA/jboss-as-system-jmx-5.1.0.GA-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/bootstrap/jboss-bootstrap/1.0.0-Beta-3/jboss-bootstrap-1.0.0-Beta-3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloader/2.0.6.GA/jboss-classloader-2.0.6.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading/2.0.6.GA/jboss-classloading-2.0.6.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-classloading-spi/5.1.0.GA/jboss-classloading-spi-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cl/jboss-classloading-vfs/2.0.6.GA/jboss-classloading-vfs-2.0.6.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.14.GA/jboss-common-core-2.2.14.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-corba-ots-spi/5.1.0.GA/jboss-corba-ots-spi-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-current-invocation-aspects/1.0.0.CR1/jboss-current-invocation-aspects-1.0.0.CR1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.6.GA/jboss-dependency-2.0.6.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client/2.0.7.GA/jboss-deployers-client-2.0.7.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-client-spi/2.0.7.GA/jboss-deployers-client-spi-2.0.7.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core/2.0.7.GA/jboss-deployers-core-2.0.7.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-core-spi/2.0.7.GA/jboss-deployers-core-spi-2.0.7.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-impl/2.0.7.GA/jboss-deployers-impl-2.0.7.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-spi/2.0.7.GA/jboss-deployers-spi-2.0.7.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-structure-spi/2.0.7.GA/jboss-deployers-structure-spi-2.0.7.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs/2.0.7.GA/jboss-deployers-vfs-2.0.7.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/deployers/jboss-deployers-vfs-spi/2.0.7.GA/jboss-deployers-vfs-spi-2.0.7.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-deployment-spi/5.1.0.GA/jboss-deployment-spi-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-ejb-api/3.0.0.GA/jboss-ejb-api-3.0.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-as-int/1.1.5/jboss-ejb3-as-int-1.1.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-cache/1.0.0/jboss-ejb3-cache-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-common/1.0.0/jboss-ejb3-common-1.0.0-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-core/1.1.5/jboss-ejb3-core-1.1.5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-core/1.1.5/jboss-ejb3-core-1.1.5-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-deployers/1.0.0/jboss-ejb3-deployers-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-endpoint/0.1.0/jboss-ejb3-endpoint-0.1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api/1.0.0/jboss-ejb3-ext-api-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-ext-api-impl/1.0.0/jboss-ejb3-ext-api-impl-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-interceptors/1.0.2/jboss-ejb3-interceptors-1.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-mc-int/1.0.1/jboss-ejb3-mc-int-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-metadata/1.0.0/jboss-ejb3-metadata-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-clustered/1.0.1/jboss-ejb3-proxy-clustered-1.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-clustered/1.0.1/jboss-ejb3-proxy-clustered-1.0.1-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-impl/1.0.2/jboss-ejb3-proxy-impl-1.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-impl/1.0.2/jboss-ejb3-proxy-impl-1.0.2-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-spi/1.0.0/jboss-ejb3-proxy-spi-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-proxy-spi/1.0.0/jboss-ejb3-proxy-spi-1.0.0-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-security/1.0.0/jboss-ejb3-security-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-security/1.0.0/jboss-ejb3-security-1.0.0-client.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-timerservice-spi/1.0.0/jboss-ejb3-timerservice-spi-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ejb3/jboss-ejb3-transactions/1.0.0/jboss-ejb3-transactions-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cluster/jboss-ha-client/1.1.1.GA/jboss-ha-client-1.1.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cluster/jboss-ha-server-api/1.1.1.GA/jboss-ha-server-api-1.1.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cluster/jboss-ha-server-cache-jbc/2.0.0.GA/jboss-ha-server-cache-jbc-2.0.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cluster/jboss-ha-server-cache-spi/2.0.0.GA/jboss-ha-server-cache-spi-2.0.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-integration/5.1.0.GA/jboss-integration-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jacc-api/1.1.0.GA_SP1/jboss-jacc-api-1.1.0.GA_SP1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jad-api/1.2.0.GA/jboss-jad-api-1.2.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jaspi-api/1.0.0.GA/jboss-jaspi-api-1.0.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-javaee/5.0.1.GA/jboss-javaee-5.0.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jbossws/jboss-jaxws/3.0.1-native-2.0.4.GA/jboss-jaxws-3.0.1-native-2.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jca-api/1.5.0.GA/jboss-jca-api-1.5.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-jca-spi/5.0.3.GA/jboss-jca-spi-5.0.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-jms-api/1.1.0.GA/jboss-jms-api-1.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jpa/jboss-jpa-deployers/1.0.0/jboss-jpa-deployers-1.0.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.6.GA/jboss-kernel-2.0.6.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logbridge/jboss-logbridge/1.0.0.GA/jboss-logbridge-1.0.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-jdk/2.1.0.GA/jboss-logging-jdk-2.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-log4j/2.1.0.GA/jboss-logging-log4j-2.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logging/jboss-logging-spi/2.1.0.GA/jboss-logging-spi-2.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/logmanager/jboss-logmanager/1.0.0.GA/jboss-logmanager-1.0.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-managed/2.1.0.CR8/jboss-managed-2.1.0.CR8.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-mdr/2.0.1.GA/jboss-mdr-2.0.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/messaging/jboss-messaging/1.4.3.GA/jboss-messaging-1.4.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/metadata/jboss-metadata/1.0.1.GA/jboss-metadata-1.0.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/man/jboss-metatype/2.1.0.SP1/jboss-metatype-2.1.0.SP1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/profiler/jvmti/jboss-profiler-jvmti/1.0.0.CR5/jboss-profiler-jvmti-1.0.0.CR5.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-profileservice-spi/5.1.0.GA/jboss-profileservice-spi-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-reflect/2.0.2.GA/jboss-reflect-2.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/remoting/jboss-remoting/2.5.1/jboss-remoting-2.5.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-remoting-aspects/1.0.2/jboss-remoting-aspects-1.0.2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-security-aspects/1.0.0.GA/jboss-security-aspects-1.0.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-security-spi/2.0.3.SP1/jboss-security-spi-2.0.3.SP1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/jboss-serialization/1.0.3.GA/jboss-serialization-1.0.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossas/jboss-server-manager/1.0.2.GA/jboss-server-manager-1.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/test/jboss-test/1.1.4.GA/jboss-test-1.1.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/javaee/jboss-transaction-api/1.0.1.GA/jboss-transaction-api-1.0.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aspects/jboss-transaction-aspects/1.0.0.GA/jboss-transaction-aspects-1.0.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/integration/jboss-transaction-spi/5.1.0.GA/jboss-transaction-spi-5.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jboss-vfs/2.1.2.GA/jboss-vfs-2.1.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/cache/jbosscache-core/3.1.0.GA/jbosscache-core-3.1.0.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx/2.0.3.SP1/jbosssx-2.0.3.SP1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx-client/2.0.3.SP1/jbosssx-client-2.0.3.SP1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxrpc/3.0.4.GA/jbossws-native-jaxrpc-3.0.4.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-jaxws/3.1.2.GA/jbossws-native-jaxws-3.1.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ws/native/jbossws-native-saaj/3.1.2.GA/jbossws-native-saaj-3.1.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/ws/jbossws-spi/1.0.3.GA/jbossws-spi-1.0.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3/jbossxacml-2.0.3.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/jbossxb/2.0.1.GA/jbossxb-2.0.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jgroups/jgroups/2.6.10.GA/jgroups-2.6.10.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnp-client/5.0.3.GA/jnp-client-5.0.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/naming/jnpserver/5.0.3.GA/jnpserver-5.0.3.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jpl-pattern/jpl-pattern/1.0/jpl-pattern-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jpl-util/jpl-util/1.0/jpl-util-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/sun-jaxws/jsr181-api/2.1.1/jsr181-api-2.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/pi4soa/org.pi4soa.cdl/3.1.0.Final/org.pi4soa.cdl-3.1.0.Final.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/pi4soa/org.pi4soa.common/3.1.0.Final/org.pi4soa.common-3.1.0.Final.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/pi4soa/org.pi4soa.service/3.1.0.Final/org.pi4soa.service-3.1.0.Final.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/aop/pluggable-instrumentor/2.1.1.GA/pluggable-instrumentor-2.1.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/qdox/qdox/1.6.1/qdox-1.6.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/quartz/quartz/1.6.0/quartz-1.6.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/jboss/web/servlet-api/2.1.1.GA/servlet-api-2.1.1.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.5.6/slf4j-api-1.5.6.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/jboss/slf4j/slf4j-jboss-logging/1.0.2.GA/slf4j-jboss-logging-1.0.2.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/trove/trove/2.1.1/trove-2.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xercesImpl/2.9.1/xercesImpl-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/apache-xerces/xml-apis/2.9.1/xml-apis-2.9.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="var" path="M2_REPO/org/savara/bundles/org.savara.activity/2.0.0-SNAPSHOT/org.savara.activity-2.0.0-SNAPSHOT.jar"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: branches/experimental/2.0.x/integration/jboss/common/pom.xml
===================================================================
--- branches/experimental/2.0.x/integration/jboss/common/pom.xml 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/integration/jboss/common/pom.xml 2011-02-13 08:59:02 UTC (rev 666)
@@ -28,6 +28,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.activity</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.pi4soa</groupId>
<artifactId>org.pi4soa.common</artifactId>
<version>${pi4soa.version}</version>
Modified: branches/experimental/2.0.x/integration/jboss/common/src/main/configs/common-assembly.xml
===================================================================
--- branches/experimental/2.0.x/integration/jboss/common/src/main/configs/common-assembly.xml 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/integration/jboss/common/src/main/configs/common-assembly.xml 2011-02-13 08:59:02 UTC (rev 666)
@@ -20,6 +20,7 @@
<outputDirectory>/lib</outputDirectory>
<includes>
<include>org.savara.integration:savara-jboss</include>
+ <include>org.savara.bundles:org.savara.activity</include>
<include>org.pi4soa:org.pi4soa.common</include>
<include>org.pi4soa:org.pi4soa.cdl</include>
<include>org.pi4soa:org.pi4soa.service</include>
Modified: branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java
===================================================================
--- branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java 2011-02-11 22:50:12 UTC (rev 665)
+++ branches/experimental/2.0.x/integration/jboss/common/src/main/java/org/savara/validator/pi4soa/JMSServiceTracker.java 2011-02-13 08:59:02 UTC (rev 666)
@@ -39,6 +39,7 @@
*/
package org.savara.validator.pi4soa;
+import java.io.ByteArrayOutputStream;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -61,6 +62,10 @@
import org.pi4soa.service.tracker.PublishingServiceTracker;
import org.pi4soa.service.tracker.ServiceTracker;
import org.pi4soa.service.tracker.TrackerEvent;
+import org.savara.activity.model.Activity;
+import org.savara.activity.model.InteractionActivity;
+import org.savara.activity.model.MessageParameter;
+import org.savara.activity.util.ActivityModelUtil;
/**
* This class provides an implementation of the publishing service
@@ -265,6 +270,54 @@
}
/**
+ * This method is used to publish the service tracker message.
+ *
+ * @param serviceName The service name
+ * @param session The session
+ * @param mesg The message
+ */
+ protected synchronized void publish(Activity activity) {
+
+ // Establish JMS connection and topic
+ if (m_initialized == false &&
+ m_jmsConnectionFactory != null &&
+ m_jmsDestination != null) {
+ initialize();
+
+ m_initialized = true;
+ }
+
+ if (m_producer != null) {
+
+ try {
+ ByteArrayOutputStream os=new ByteArrayOutputStream();
+
+ ActivityModelUtil.serialize(activity, os);
+
+ String act=new String(os.toByteArray());
+
+ if (logger.isLoggable(Level.FINE)) {
+ logger.fine(act);
+ }
+
+ TextMessage tm=m_session.createTextMessage(act);
+
+ if (logger.isLoggable(Level.FINEST)) {
+ logger.finest(Thread.currentThread()+
+ ": Sending JMS ServiceTracker record="+tm);
+ }
+
+ m_producer.send(tm);
+ } catch(Exception e) {
+ logger.severe("Failed to publish message: "+e);
+ }
+
+ } else {
+ logger.warning("Could not publish message: "+activity);
+ }
+ }
+
+ /**
* This method closes the service tracker.
*
* @exception ServiceException Failed to close
@@ -322,22 +375,6 @@
*/
public void serviceStarted(ServiceDescription service,
Session session) {
- String version="";
-
- if (service.getVersion() != null) {
- version = VERSION_ATTR+"=\""+
- service.getVersion()+"\" ";
- }
-
- String xml="<sd:"+TrackerEvent.SERVICE_STARTED+" "+
- NAME_ATTR+"=\""+service.getFullyQualifiedName()+
- "\" "+version+SERVICE_INSTANCE_ID_ATTR+"=\""+
- getServiceInstanceId(session)+"\" "+
- SESSION_ID_ATTR+"=\""+
- getSessionId(session)+"\" "+TIMESTAMP_ATTR+"=\""+
- System.currentTimeMillis()+"\" />";
-
- //record(getServiceName(session), session, xml, INFO, null);
}
/**
@@ -349,22 +386,6 @@
*/
public void serviceFinished(ServiceDescription service,
Session session) {
- String version="";
-
- if (service.getVersion() != null) {
- version = VERSION_ATTR+"=\""+
- service.getVersion()+"\" ";
- }
-
- String xml="<sd:"+TrackerEvent.SERVICE_FINISHED+
- " "+NAME_ATTR+"=\""+service.getFullyQualifiedName()+
- "\" "+version+SERVICE_INSTANCE_ID_ATTR+"=\""+
- getServiceInstanceId(session)+"\" "+
- SESSION_ID_ATTR+"=\""+
- getSessionId(session)+"\" "+TIMESTAMP_ATTR+"=\""+
- System.currentTimeMillis()+"\" />";
-
- //record(getServiceName(session), session, xml, INFO, null);
}
/**
@@ -375,15 +396,6 @@
* @param session The session
*/
public void subSessionStarted(Session parent, Session session) {
- String xml="<sd:"+TrackerEvent.SUB_SESSION_STARTED+
- " "+SERVICE_INSTANCE_ID_ATTR+"=\""+
- getServiceInstanceId(session)+"\" "+
- PARENT_SESSION_ID_ATTR+"=\""+getSessionId(parent)+
- "\" "+SESSION_ID_ATTR+"=\""+
- getSessionId(session)+"\" "+TIMESTAMP_ATTR+"=\""+
- System.currentTimeMillis()+"\" />";
-
- //record(getServiceName(session), session, xml, INFO, null);
}
/**
@@ -394,15 +406,6 @@
* @param session The session
*/
public void subSessionFinished(Session parent, Session session) {
- String xml="<sd:"+TrackerEvent.SUB_SESSION_FINISHED+
- " "+SERVICE_INSTANCE_ID_ATTR+"=\""+
- getServiceInstanceId(session)+"\" "+
- PARENT_SESSION_ID_ATTR+"=\""+getSessionId(parent)+
- "\" "+SESSION_ID_ATTR+"=\""+
- getSessionId(session)+"\" "+TIMESTAMP_ATTR+"=\""+
- System.currentTimeMillis()+"\" />";
-
- //record(getServiceName(session), session, xml, INFO, null);
}
/**
@@ -416,6 +419,55 @@
*/
public void sentMessage(Send activity, Session session,
Channel channel, Message mesg) {
+
+ InteractionActivity ia=new InteractionActivity();
+
+ ia.setOperationName(activity.getOperationName());
+ ia.setFaultName(activity.getFaultName());
+ ia.setDestinationType(mesg.getServiceType());
+ ia.setOutbound(true);
+
+ ia.setRequest(activity.getMessageDefinition().getClassification() == MessageClassification.REQUEST);
+
+ MessageParameter mp=new MessageParameter();
+ mp.setType(mesg.getType());
+ mp.setValue(getMessagePayload(mesg));
+
+ ia.getParameter().add(mp);
+
+ // Add context information from the identities info
+ java.util.Iterator<Identity> ids=null;
+
+ if (session != null) {
+ ids = session.getPrimaryIdentities().iterator();
+ }
+
+ // If session has no identity information, but a
+ // message is supplied, then try getting identity
+ // from it.
+ if ((ids == null || ids.hasNext() == false) &&
+ mesg != null && mesg.getMessageIdentities() != null) {
+ ids = mesg.getMessageIdentities().iterator();
+ }
+
+ if (ids != null && ids.hasNext()) {
+
+ while (ids.hasNext()) {
+ Identity cur=ids.next();
+
+ org.savara.activity.model.Context context=new org.savara.activity.model.Context();
+
+ context.setName(cur.getName());
+ context.setValue(XMLUtils.encodeXMLString(cur.getFullId()));
+
+ ia.getContext().add(context);
+ }
+ }
+
+ publish(ia);
+
+ /*
+
String channelText=getChannelText(channel);
String messageText=getMessageText(mesg,
activity.getMessageDefinition());
@@ -429,6 +481,7 @@
channelText+"</sd:"+TrackerEvent.SENT_MESSAGE+">";
record(getServiceName(session), session, xml, INFO, null);
+ */
}
/**
@@ -462,6 +515,24 @@
*/
public void receivedMessage(Receive activity, Session session,
Channel channel, Message mesg) {
+ InteractionActivity ia=new InteractionActivity();
+
+ ia.setOperationName(activity.getOperationName());
+ ia.setFaultName(activity.getFaultName());
+ ia.setDestinationType(mesg.getServiceType());
+ ia.setOutbound(false);
+
+ ia.setRequest(activity.getMessageDefinition().getClassification() == MessageClassification.REQUEST);
+
+ MessageParameter mp=new MessageParameter();
+ mp.setType(mesg.getType());
+ mp.setValue(getMessagePayload(mesg));
+
+ ia.getParameter().add(mp);
+
+ publish(ia);
+
+ /*
String channelText=getChannelText(channel);
String messageText=getMessageText(mesg,
activity.getMessageDefinition());
@@ -475,6 +546,7 @@
channelText+"</sd:"+TrackerEvent.RECEIVED_MESSAGE+">";
record(getServiceName(session), session, xml, INFO, null);
+ */
}
/**
15 years, 2 months
- 1
- 0
savara SVN: r665 - in branches/experimental/2.0.x/tools: site and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-11 17:50:12 -0500 (Fri, 11 Feb 2011)
New Revision: 665
Modified:
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/site/pom.xml
Log:
Included additional plugins and their dependencies into the update site.
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-02-11 22:09:29 UTC (rev 664)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-02-11 22:50:12 UTC (rev 665)
@@ -277,4 +277,11 @@
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.savara.monitor"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-02-11 22:09:29 UTC (rev 664)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-02-11 22:50:12 UTC (rev 665)
@@ -36,6 +36,11 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.monitor</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
<artifactId>org.savara.pi4soa.cdm</artifactId>
<version>${savara.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/tools/site/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/site/pom.xml 2011-02-11 22:09:29 UTC (rev 664)
+++ branches/experimental/2.0.x/tools/site/pom.xml 2011-02-11 22:50:12 UTC (rev 665)
@@ -36,6 +36,11 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.monitor</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
<artifactId>org.savara.bpel</artifactId>
<version>${savara.version}</version>
</dependency>
15 years, 2 months
- 1
- 0
savara SVN: r664 - in branches/experimental/2.0.x/tools: features/org.savara.tools.feature and 1 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-11 17:09:29 -0500 (Fri, 11 Feb 2011)
New Revision: 664
Removed:
branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/
Modified:
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/features/pom.xml
branches/experimental/2.0.x/tools/site/pom.xml
Log:
Add missing plugins from the update site.
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-02-11 21:32:36 UTC (rev 663)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-02-11 22:09:29 UTC (rev 664)
@@ -249,27 +249,32 @@
version="0.0.0"
unpack="false"/>
-<!--
<plugin
- id="org.savara.tap.eclipse"
+ id="org.savara.protocol"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.savara.tap.model"
+ id="org.savara.scenario"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
<plugin
- id="org.savara.tap.validation"
+ id="org.savara.tools.scenario"
download-size="0"
install-size="0"
version="0.0.0"
unpack="false"/>
--->
+ <plugin
+ id="org.savara.activity"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-02-11 21:32:36 UTC (rev 663)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-02-11 22:09:29 UTC (rev 664)
@@ -16,6 +16,16 @@
<dependencies>
<dependency>
<groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.activity</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.bpel</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
<artifactId>org.savara.common</artifactId>
<version>${savara.version}</version>
</dependency>
@@ -26,20 +36,25 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.wsdl</artifactId>
+ <artifactId>org.savara.pi4soa.cdm</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.bpel</artifactId>
+ <artifactId>org.savara.protocol</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.pi4soa.cdm</artifactId>
+ <artifactId>org.savara.scenario</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.wsdl</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.scribble.bundles</groupId>
<artifactId>org.scribble.protocol.projection</artifactId>
<version>${scribble.version}</version>
@@ -51,6 +66,11 @@
</dependency>
<dependency>
<groupId>org.savara.tools</groupId>
+ <artifactId>org.savara.tools.scenario</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.tools</groupId>
<artifactId>org.savara.tools.wsdl</artifactId>
<version>${savara.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/tools/features/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/pom.xml 2011-02-11 21:32:36 UTC (rev 663)
+++ branches/experimental/2.0.x/tools/features/pom.xml 2011-02-11 22:09:29 UTC (rev 664)
@@ -15,7 +15,6 @@
<modules>
<module>org.savara.tools.feature</module>
- <module>org.jboss.savara.tools.feature</module>
</modules>
</project>
Modified: branches/experimental/2.0.x/tools/site/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/site/pom.xml 2011-02-11 21:32:36 UTC (rev 663)
+++ branches/experimental/2.0.x/tools/site/pom.xml 2011-02-11 22:09:29 UTC (rev 664)
@@ -16,11 +16,26 @@
<dependencies>
<dependency>
<groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.activity</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
<artifactId>org.savara.common</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.protocol</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.scenario</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
<artifactId>org.savara.bpel</artifactId>
<version>${savara.version}</version>
</dependency>
15 years, 2 months
- 1
- 0
savara SVN: r663 - in branches/experimental/2.0.x: integration/jboss/common/src/main/configs and 2 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-11 16:32:36 -0500 (Fri, 11 Feb 2011)
New Revision: 663
Modified:
branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF
branches/experimental/2.0.x/integration/jboss/common/src/main/configs/common-assembly.xml
branches/experimental/2.0.x/integration/jboss/esb/src/main/configs/esb-assembly.xml
branches/experimental/2.0.x/integration/jboss/wsnative/src/main/configs/ws-native-assembly.xml
Log:
Update bundle version from qualifier to SNAPSHOT, and fix packaging of lib in server deployables.
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF 2011-02-11 18:17:49 UTC (rev 662)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF 2011-02-11 21:32:36 UTC (rev 663)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA WSDL
Bundle-SymbolicName: org.savara.wsdl
-Bundle-Version: 2.0.0.qualifier
+Bundle-Version: 2.0.0.SNAPSHOT
Bundle-Activator: org.savara.wsdl.osgi.Activator
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: branches/experimental/2.0.x/integration/jboss/common/src/main/configs/common-assembly.xml
===================================================================
--- branches/experimental/2.0.x/integration/jboss/common/src/main/configs/common-assembly.xml 2011-02-11 18:17:49 UTC (rev 662)
+++ branches/experimental/2.0.x/integration/jboss/common/src/main/configs/common-assembly.xml 2011-02-11 21:32:36 UTC (rev 663)
@@ -19,7 +19,7 @@
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<includes>
- <include>org.savara.validators:savara-validator-jboss</include>
+ <include>org.savara.integration:savara-jboss</include>
<include>org.pi4soa:org.pi4soa.common</include>
<include>org.pi4soa:org.pi4soa.cdl</include>
<include>org.pi4soa:org.pi4soa.service</include>
Modified: branches/experimental/2.0.x/integration/jboss/esb/src/main/configs/esb-assembly.xml
===================================================================
--- branches/experimental/2.0.x/integration/jboss/esb/src/main/configs/esb-assembly.xml 2011-02-11 18:17:49 UTC (rev 662)
+++ branches/experimental/2.0.x/integration/jboss/esb/src/main/configs/esb-assembly.xml 2011-02-11 21:32:36 UTC (rev 663)
@@ -19,7 +19,7 @@
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<includes>
- <include>org.savara.validators:savara-validator-jbossesb</include>
+ <include>org.savara.integration:savara-jbossesb</include>
</includes>
</dependencySet>
</dependencySets>
Modified: branches/experimental/2.0.x/integration/jboss/wsnative/src/main/configs/ws-native-assembly.xml
===================================================================
--- branches/experimental/2.0.x/integration/jboss/wsnative/src/main/configs/ws-native-assembly.xml 2011-02-11 18:17:49 UTC (rev 662)
+++ branches/experimental/2.0.x/integration/jboss/wsnative/src/main/configs/ws-native-assembly.xml 2011-02-11 21:32:36 UTC (rev 663)
@@ -19,7 +19,7 @@
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<includes>
- <include>org.savara.validators:savara-validator-jbossws-native</include>
+ <include>org.savara.integration:savara-jbossws-native</include>
</includes>
</dependencySet>
</dependencySets>
15 years, 2 months
- 1
- 0
savara SVN: r662 - branches/experimental/2.0.x/tools/plugins.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-11 13:17:49 -0500 (Fri, 11 Feb 2011)
New Revision: 662
Removed:
branches/experimental/2.0.x/tools/plugins/org.savara.tap.eclipse/
branches/experimental/2.0.x/tools/plugins/org.savara.tap.model/
branches/experimental/2.0.x/tools/plugins/org.savara.tap.validation/
Modified:
branches/experimental/2.0.x/tools/plugins/pom.xml
Log:
Removing the TAP concept from Savara2 (for now) as dependency management in the Eclipse environment will hopefully be based on the repository dependency information.
Modified: branches/experimental/2.0.x/tools/plugins/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/pom.xml 2011-02-11 18:04:07 UTC (rev 661)
+++ branches/experimental/2.0.x/tools/plugins/pom.xml 2011-02-11 18:17:49 UTC (rev 662)
@@ -15,11 +15,6 @@
</parent>
<modules>
- <!--
- <module>org.savara.tap.eclipse</module>
- <module>org.savara.tap.model</module>
- <module>org.savara.tap.validation</module>
- -->
<module>org.savara.tools.bpel</module>
<module>org.savara.tools.bpmn</module>
<module>org.savara.tools.monitor</module>
15 years, 2 months
- 1
- 0
savara SVN: r661 - in branches/experimental/2.0.x/bundles/org.savara.activity/src: test/java/org/savara/activity and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-11 13:04:07 -0500 (Fri, 11 Feb 2011)
New Revision: 661
Added:
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityFilter.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityProcessor.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/DefaultActivityProcessor.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/DefaultActivityProcessorTest.java
Log:
Add filter component and implement flow through the activity processor in the default implementation.
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityFilter.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityFilter.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityFilter.java 2011-02-11 18:04:07 UTC (rev 661)
@@ -0,0 +1,36 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, 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.savara.activity;
+
+import org.savara.activity.model.Activity;
+
+/**
+ * This interface is used to provide activity filter capabilities.
+ *
+ */
+public interface ActivityFilter {
+
+ /**
+ * This method determines whether the supplied activity
+ * should be processed.
+ *
+ * @param activity The activity to be filtered
+ */
+ public boolean isRelevant(Activity activity);
+
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityProcessor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityProcessor.java 2011-02-11 16:47:02 UTC (rev 660)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityProcessor.java 2011-02-11 18:04:07 UTC (rev 661)
@@ -29,6 +29,34 @@
public interface ActivityProcessor {
/**
+ * This method adds a new activity analyser.
+ *
+ * @param analyser The analyser
+ */
+ public void addActivityAnalyser(ActivityAnalyser analyser);
+
+ /**
+ * This method removes an existing activity analyser.
+ *
+ * @param analyser The analyser
+ */
+ public void removeActivityAnalyser(ActivityAnalyser analyser);
+
+ /**
+ * This method adds a new activity filter.
+ *
+ * @param filter The filter
+ */
+ public void addActivityFilter(ActivityFilter filter);
+
+ /**
+ * This method removes an existing activity filter.
+ *
+ * @param filter The filter
+ */
+ public void removeActivityFilter(ActivityFilter filter);
+
+ /**
* This method adds a new activity validator.
*
* @param validator The validator
@@ -43,20 +71,34 @@
public void removeActivityValidator(ActivityValidator validator);
/**
- * This method adds a new activity analyser.
+ * This method adds a new activity store.
*
- * @param analyser The analyser
+ * @param store The store
*/
- public void addActivityAnalyser(ActivityAnalyser analyser);
+ public void addActivityStore(ActivityStore store);
/**
- * This method removes an existing activity analyser.
+ * This method removes an existing activity store.
*
- * @param analyser The analyser
+ * @param store The store
*/
- public void removeActivityAnalyser(ActivityAnalyser analyser);
+ public void removeActivityStore(ActivityStore store);
/**
+ * This method adds a new activity notifier.
+ *
+ * @param notifier The notifier
+ */
+ public void addActivityNotifier(ActivityNotifier notifier);
+
+ /**
+ * This method removes an existing activity notifier.
+ *
+ * @param notifier The notifier
+ */
+ public void removeActivityNotifier(ActivityNotifier notifier);
+
+ /**
* This method processes the supplied activity event against
* any predefined analysers and validators.
*
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/DefaultActivityProcessor.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/DefaultActivityProcessor.java 2011-02-11 16:47:02 UTC (rev 660)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/DefaultActivityProcessor.java 2011-02-11 18:04:07 UTC (rev 661)
@@ -28,18 +28,69 @@
*/
public class DefaultActivityProcessor implements ActivityProcessor {
+ private java.util.List<ActivityAnalyser> m_analysers=new java.util.Vector<ActivityAnalyser>();
+ private java.util.List<ActivityFilter> m_filters=new java.util.Vector<ActivityFilter>();
private java.util.List<ActivityValidator> m_validators=new java.util.Vector<ActivityValidator>();
- private java.util.List<ActivityAnalyser> m_analysers=new java.util.Vector<ActivityAnalyser>();
+ private java.util.List<ActivityStore> m_stores=new java.util.Vector<ActivityStore>();
+ private java.util.List<ActivityNotifier> m_notifiers=new java.util.Vector<ActivityNotifier>();
protected java.util.List<ActivityAnalyser> getAnalysers() {
return(m_analysers);
}
+ protected java.util.List<ActivityFilter> getFilters() {
+ return(m_filters);
+ }
+
protected java.util.List<ActivityValidator> getValidators() {
return(m_validators);
}
+ protected java.util.List<ActivityStore> getStores() {
+ return(m_stores);
+ }
+
+ protected java.util.List<ActivityNotifier> getNotifiers() {
+ return(m_notifiers);
+ }
+
/**
+ * This method adds a new activity analyser.
+ *
+ * @param analyser The analyser
+ */
+ public void addActivityAnalyser(ActivityAnalyser analyser) {
+ m_analysers.add(analyser);
+ }
+
+ /**
+ * This method removes an existing activity analyser.
+ *
+ * @param analyser The analyser
+ */
+ public void removeActivityAnalyser(ActivityAnalyser analyser) {
+ m_analysers.remove(analyser);
+ }
+
+ /**
+ * This method adds a new activity filter.
+ *
+ * @param filter The filter
+ */
+ public void addActivityFilter(ActivityFilter filter) {
+ m_filters.add(filter);
+ }
+
+ /**
+ * This method removes an existing activity filter.
+ *
+ * @param filter The filter
+ */
+ public void removeActivityFilter(ActivityFilter filter) {
+ m_filters.remove(filter);
+ }
+
+ /**
* This method adds a new activity validator.
*
* @param validator The validator
@@ -58,36 +109,80 @@
}
/**
- * This method adds a new activity analyser.
+ * This method adds a new activity notifier.
*
- * @param analyser The analyser
+ * @param notifier The notifier
*/
- public void addActivityAnalyser(ActivityAnalyser analyser) {
- m_analysers.add(analyser);
+ public void addActivityNotifier(ActivityNotifier notifier) {
+ m_notifiers.add(notifier);
}
/**
- * This method removes an existing activity analyser.
+ * This method removes an existing activity notifier.
*
- * @param analyser The analyser
+ * @param notifier The notifier
*/
- public void removeActivityAnalyser(ActivityAnalyser analyser) {
- m_analysers.remove(analyser);
+ public void removeActivityNotifier(ActivityNotifier notifier) {
+ m_notifiers.remove(notifier);
}
/**
+ * This method adds a new activity store.
+ *
+ * @param store The store
+ */
+ public void addActivityStore(ActivityStore store) {
+ m_stores.add(store);
+ }
+
+ /**
+ * This method removes an existing activity store.
+ *
+ * @param store The store
+ */
+ public void removeActivityStore(ActivityStore store) {
+ m_stores.remove(store);
+ }
+
+ /**
* This method processes the supplied activity event against
* any predefined analysers and validators.
*
* @param activity The activity event to be processed
*/
public void process(Activity activity) {
- for (ActivityAnalyser aa : m_analysers) {
+
+ // Invoke the analysers to derive any additional information
+ for (ActivityAnalyser aa : getAnalysers()) {
aa.analyse(activity);
}
- for (ActivityValidator av : m_validators) {
- av.validate(activity);
+
+ // Immediately consider the activity relevant if no filters
+ boolean process=(getFilters().size() == 0);
+
+ // If filters defined, then check them until one indicates interest
+ for (ActivityFilter af : getFilters()) {
+ process = af.isRelevant(activity);
+
+ if (process) {
+ break;
+ }
}
+
+ if (process) {
+ // Validate the activity
+ for (ActivityValidator av : getValidators()) {
+ av.validate(activity);
+ }
+
+ // Store the activity
+ for (ActivityStore as : getStores()) {
+ as.store(activity);
+ }
+
+ for (ActivityNotifier an : getNotifiers()) {
+ an.publish(activity);
+ }
+ }
}
-
}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/DefaultActivityProcessorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/DefaultActivityProcessorTest.java 2011-02-11 16:47:02 UTC (rev 660)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/DefaultActivityProcessorTest.java 2011-02-11 18:04:07 UTC (rev 661)
@@ -23,6 +23,7 @@
import org.savara.activity.ActivityValidator;
import org.savara.activity.DefaultActivityProcessor;
import org.savara.activity.model.Activity;
+import org.savara.common.config.Configuration;
import static org.junit.Assert.*;
@@ -78,6 +79,82 @@
avm.process(act);
}
+ @Test
+ public void testNoFilterStore() {
+ ActivityProcessor ap=new DefaultActivityProcessor();
+
+ TestStore store=new TestStore();
+
+ ap.addActivityStore(store);
+
+ Activity act=new Activity();
+
+ ap.process(act);
+
+ if (store.getStore().size() == 0) {
+ fail("Activity event not stored");
+ }
+ }
+
+ @Test
+ public void testOneTrueFilterStore() {
+ ActivityProcessor ap=new DefaultActivityProcessor();
+
+ TestStore store=new TestStore();
+ TestFilter filter=new TestFilter(true);
+
+ ap.addActivityFilter(filter);
+ ap.addActivityStore(store);
+
+ Activity act=new Activity();
+
+ ap.process(act);
+
+ if (store.getStore().size() == 0) {
+ fail("Activity event not stored");
+ }
+ }
+
+ @Test
+ public void testOneFalseFilterStore() {
+ ActivityProcessor ap=new DefaultActivityProcessor();
+
+ TestStore store=new TestStore();
+ TestFilter filter=new TestFilter(false);
+
+ ap.addActivityFilter(filter);
+ ap.addActivityStore(store);
+
+ Activity act=new Activity();
+
+ ap.process(act);
+
+ if (store.getStore().size() != 0) {
+ fail("Activity event should not have been stored");
+ }
+ }
+
+
+ @Test
+ public void testOneFalseOneTrueFilterStore() {
+ ActivityProcessor ap=new DefaultActivityProcessor();
+
+ TestStore store=new TestStore();
+ TestFilter filterFalse=new TestFilter(false);
+ TestFilter filterTrue=new TestFilter(true);
+
+ ap.addActivityFilter(filterFalse);
+ ap.addActivityFilter(filterTrue);
+ ap.addActivityStore(store);
+
+ Activity act=new Activity();
+
+ ap.process(act);
+
+ if (store.getStore().size() == 0) {
+ fail("Activity event should have been stored");
+ }
+ }
public class TestAnalyser implements ActivityAnalyser {
private Activity m_activity=null;
@@ -91,7 +168,20 @@
}
}
+
+ public class TestFilter implements ActivityFilter {
+
+ boolean m_isRelevant=false;
+
+ public TestFilter(boolean relevant) {
+ m_isRelevant = relevant;
+ }
+ public boolean isRelevant(Activity activity) {
+ return(m_isRelevant);
+ }
+ }
+
public class TestValidator implements ActivityValidator {
private Activity m_activity=null;
@@ -104,7 +194,30 @@
m_activity = activity;
}
}
+
+ public class TestStore implements ActivityStore {
+
+ private java.util.List<Activity> m_store=new java.util.Vector<Activity>();
+ public void initialize(Configuration config) {
+ }
+
+ public void store(Activity activity) {
+ m_store.add(activity);
+ }
+
+ public java.util.List<Activity> getStore() {
+ return(m_store);
+ }
+
+ public Activity queryById(String id) {
+ return(null);
+ }
+
+ public void close() {
+ }
+ }
+
public class TestOrderAnalyserValidator implements ActivityAnalyser, ActivityValidator {
private Activity m_activity=null;
15 years, 2 months
- 1
- 0
savara SVN: r660 - in branches/experimental/2.0.x/bundles/org.savara.activity: src/main/java/org/savara/activity and 3 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-02-11 11:47:02 -0500 (Fri, 11 Feb 2011)
New Revision: 660
Added:
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityAnalyser.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityNotifier.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityProcessor.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityProcessorFactory.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityStore.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityValidator.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/DefaultActivityProcessor.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ComponentActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InteractionActivity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageParameter.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Status.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/DefaultActivityProcessorTest.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Facet.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Interaction.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Lifecycle.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Process.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Task.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/
branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/validation/
Modified:
branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Context.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java
branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/osgi/Activator.java
Log:
Initial refactoring based on the design note: http://community.jboss.org/wiki/DesignNoteActivityMonitoringManagementinS...
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/schema/Activity.xsd 2011-02-11 16:47:02 UTC (rev 660)
@@ -3,110 +3,66 @@
<complexType name="Activity">
<sequence>
- <element name="facet" type="tns:Facet" maxOccurs="unbounded" minOccurs="1"></element>
<element name="analysis" type="tns:Analysis" minOccurs="0"
maxOccurs="unbounded">
</element>
+ <element name="context" type="tns:Context" minOccurs="0"
+ maxOccurs="unbounded">
+ </element>
</sequence>
<attribute name="id" type="ID"></attribute>
- <attribute name="componentName" type="string"></attribute>
- <attribute name="componentInstanceId" type="string"></attribute>
<attribute name="timestamp" type="dateTime"></attribute>
</complexType>
- <complexType name="Facet" abstract="true"></complexType>
+ <complexType name="Analysis" abstract="true"></complexType>
<complexType name="Context">
- <complexContent>
- <extension base="tns:Facet">
- <attribute name="name" type="string"></attribute>
- <attribute name="value" type="string"></attribute>
- </extension>
- </complexContent>
+ <attribute name="name" type="string"></attribute>
+ <attribute name="value" type="string"></attribute>
</complexType>
- <complexType name="Process">
+ <complexType name="ComponentActivity">
<complexContent>
- <extension base="tns:Facet">
- <!-- May be the same as the 'componentInstanceId' -->
- <attribute name="instanceId" type="string"></attribute>
- <attribute name="definitionId" type="string"></attribute>
- <attribute name="name" type="string"></attribute>
+ <extension base="tns:Activity">
+ <attribute name="instanceId" type="string"></attribute>
+ <attribute name="componentId" type="string"></attribute>
+ <attribute name="componentName" type="string"></attribute>
+ <attribute name="status" type="tns:Status"></attribute>
</extension>
</complexContent>
</complexType>
-
- <complexType name="Task">
+
+ <simpleType name="Status">
+ <restriction base="string">
+ <enumeration value="Started"></enumeration>
+ <enumeration value="Finished"></enumeration>
+ </restriction>
+ </simpleType>
+
+ <complexType name="InteractionActivity">
<complexContent>
- <extension base="tns:Facet">
- <attribute name="definitionId" type="string"></attribute>
- <attribute name="name" type="string"></attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="Error">
- <complexContent>
- <extension base="tns:Facet">
- <attribute name="description" type="string"></attribute>
- <attribute name="type" type="string"></attribute>
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="Interaction" abstract="true">
- <complexContent>
- <extension base="tns:Facet">
+ <extension base="tns:Activity">
<sequence>
- <element name="value" type="anyURI"></element>
+ <element name="parameter" type="tns:MessageParameter"></element>
</sequence>
+ <attribute name="destinationType" type="string"></attribute>
+ <attribute name="destinationAddress" type="string"></attribute>
+ <attribute name="replyToAddress" type="string"></attribute>
<attribute name="operationName" type="string"></attribute>
<attribute name="faultName" type="string"></attribute>
- <attribute name="messageType" type="string"></attribute>
<attribute name="request" type="boolean" default="true"></attribute>
+ <attribute name="outbound" type="boolean" default="true"></attribute>
</extension>
</complexContent>
</complexType>
- <complexType name="MessageSent">
- <complexContent>
- <extension base="tns:Interaction">
- <attribute name="destination" type="string"></attribute>
- </extension>
- </complexContent>
+ <complexType name="MessageParameter">
+ <sequence>
+ <element name="value" type="anyURI"></element>
+ </sequence>
+ <attribute name="type" type="string"></attribute>
</complexType>
-
- <complexType name="MessageReceived">
- <complexContent>
- <extension base="tns:Interaction">
- <attribute name="source" type="string"></attribute>
- </extension>
- </complexContent>
- </complexType>
- <complexType name="Lifecycle" abstract="true">
- <complexContent>
- <extension base="tns:Facet">
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="InstanceFinished">
- <complexContent>
- <extension base="tns:Lifecycle">
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="InstanceStarted">
- <complexContent>
- <extension base="tns:Lifecycle">
- </extension>
- </complexContent>
- </complexType>
-
- <complexType name="Analysis" abstract="true"></complexType>
-
<complexType name="ProtocolAnalysis">
<complexContent>
<extension base="tns:Analysis">
@@ -116,5 +72,7 @@
</extension>
</complexContent>
</complexType>
-
+
+
+ <element name="activity" type="tns:Activity"></element>
</schema>
\ No newline at end of file
Copied: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityAnalyser.java (from rev 648, branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityAnalyser.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityAnalyser.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityAnalyser.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, 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.savara.activity;
+
+import org.savara.activity.model.Activity;
+
+/**
+ * This interface is used to provide activity analysis capabilities.
+ *
+ */
+public interface ActivityAnalyser {
+
+ /**
+ * This method analyses the supplied activity.
+ *
+ * @param activity The activity to be analysed
+ */
+ public void analyse(Activity activity);
+
+}
Copied: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityNotifier.java (from rev 648, branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityNotificationService.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityNotifier.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityNotifier.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -0,0 +1,51 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, 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.savara.activity;
+
+import org.savara.activity.model.Activity;
+import org.savara.common.config.Configuration;
+
+/**
+ * This interface represents the activity notification service,
+ * used to publish activity records after they have been
+ * recorded.
+ *
+ */
+public interface ActivityNotifier {
+
+ /**
+ * This method initializes the notification service using
+ * the supplied configuration.
+ *
+ * @param config
+ */
+ public void initialize(Configuration config);
+
+ /**
+ * This method publishes the supplied activity event.
+ *
+ * @param activity The activity event
+ */
+ public void publish(Activity activity);
+
+ /**
+ * This method closes the notification service.
+ */
+ public void close();
+
+}
Copied: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityProcessor.java (from rev 648, branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidationManager.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityProcessor.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityProcessor.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -0,0 +1,67 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, 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.savara.activity;
+
+import org.savara.activity.model.Activity;
+
+/**
+ * This interface represents the activity processor
+ * responsible for managing a set of analysers and validators,
+ * and applying a supplied activity against them. The analysers
+ * are applied prior to the validators, to derived additional
+ * information that may be required during validation.
+ */
+public interface ActivityProcessor {
+
+ /**
+ * This method adds a new activity validator.
+ *
+ * @param validator The validator
+ */
+ public void addActivityValidator(ActivityValidator validator);
+
+ /**
+ * This method removes an existing activity validator.
+ *
+ * @param validator The validator
+ */
+ public void removeActivityValidator(ActivityValidator validator);
+
+ /**
+ * This method adds a new activity analyser.
+ *
+ * @param analyser The analyser
+ */
+ public void addActivityAnalyser(ActivityAnalyser analyser);
+
+ /**
+ * This method removes an existing activity analyser.
+ *
+ * @param analyser The analyser
+ */
+ public void removeActivityAnalyser(ActivityAnalyser analyser);
+
+ /**
+ * This method processes the supplied activity event against
+ * any predefined analysers and validators.
+ *
+ * @param activity The activity event to be processed
+ */
+ public void process(Activity activity);
+
+}
Copied: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityProcessorFactory.java (from rev 648, branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidationManagerFactory.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityProcessorFactory.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityProcessorFactory.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -0,0 +1,47 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, 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.savara.activity;
+
+/**
+ * This class provides a factory for the ActivityProcessor
+ * component.
+ *
+ */
+public class ActivityProcessorFactory {
+
+ private static ActivityProcessor m_instance=null;
+
+ /**
+ * This method returns the activity processor.
+ *
+ * @return The activity processor
+ */
+ public static ActivityProcessor getActivityProcessor() {
+ return(m_instance);
+ }
+
+ /**
+ * This method sets the activity processor associated with the
+ * factory.
+ *
+ * @param processor The activity processor
+ */
+ public static void setActivityProcessor(ActivityProcessor processor) {
+ m_instance = processor;
+ }
+}
Copied: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityStore.java (from rev 648, branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/services/ActivityLogService.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityStore.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityStore.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -0,0 +1,59 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, 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.savara.activity;
+
+import org.savara.activity.model.Activity;
+import org.savara.common.config.Configuration;
+
+/**
+ * This interface represents the activity store
+ * used to log activity events in a persistence store
+ * and provide a query mechanism.
+ *
+ */
+public interface ActivityStore {
+
+ /**
+ * This method initializes the log service using
+ * the supplied configuration.
+ *
+ * @param config
+ */
+ public void initialize(Configuration config);
+
+ /**
+ * This method logs the activity record.
+ *
+ * @param activity The activity
+ */
+ public void store(Activity activity);
+
+ /**
+ * This method retrieves the activity record
+ * associated with the supplied id.
+ *
+ * @param id The activity id, or null if not found
+ */
+ public Activity queryById(String id);
+
+ /**
+ * This method closes the log service.
+ */
+ public void close();
+
+}
Copied: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityValidator.java (from rev 648, branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/ActivityValidator.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityValidator.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/ActivityValidator.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, 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.savara.activity;
+
+import org.savara.activity.model.Activity;
+
+/**
+ * This interface is used to provide activity validation capabilities.
+ *
+ */
+public interface ActivityValidator {
+
+ /**
+ * This method validates the supplied activity.
+ *
+ * @param activity The activity to be validated
+ */
+ public void validate(Activity activity);
+
+}
Copied: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/DefaultActivityProcessor.java (from rev 648, branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/validation/DefaultActivityValidationManager.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/DefaultActivityProcessor.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/DefaultActivityProcessor.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -0,0 +1,93 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, 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.savara.activity;
+
+import org.savara.activity.model.Activity;
+
+/**
+ * This class implements a default activity validation manager
+ * responsible for managing a set of analysers and validators,
+ * and applying a supplied activity against them. The analysers
+ * are applied prior to the validators, to derived additional
+ * information that may be required during validation.
+ */
+public class DefaultActivityProcessor implements ActivityProcessor {
+
+ private java.util.List<ActivityValidator> m_validators=new java.util.Vector<ActivityValidator>();
+ private java.util.List<ActivityAnalyser> m_analysers=new java.util.Vector<ActivityAnalyser>();
+
+ protected java.util.List<ActivityAnalyser> getAnalysers() {
+ return(m_analysers);
+ }
+
+ protected java.util.List<ActivityValidator> getValidators() {
+ return(m_validators);
+ }
+
+ /**
+ * This method adds a new activity validator.
+ *
+ * @param validator The validator
+ */
+ public void addActivityValidator(ActivityValidator validator) {
+ m_validators.add(validator);
+ }
+
+ /**
+ * This method removes an existing activity validator.
+ *
+ * @param validator The validator
+ */
+ public void removeActivityValidator(ActivityValidator validator) {
+ m_validators.remove(validator);
+ }
+
+ /**
+ * This method adds a new activity analyser.
+ *
+ * @param analyser The analyser
+ */
+ public void addActivityAnalyser(ActivityAnalyser analyser) {
+ m_analysers.add(analyser);
+ }
+
+ /**
+ * This method removes an existing activity analyser.
+ *
+ * @param analyser The analyser
+ */
+ public void removeActivityAnalyser(ActivityAnalyser analyser) {
+ m_analysers.remove(analyser);
+ }
+
+ /**
+ * This method processes the supplied activity event against
+ * any predefined analysers and validators.
+ *
+ * @param activity The activity event to be processed
+ */
+ public void process(Activity activity) {
+ for (ActivityAnalyser aa : m_analysers) {
+ aa.analyse(activity);
+ }
+ for (ActivityValidator av : m_validators) {
+ av.validate(activity);
+ }
+ }
+
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Activity.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
+// Generated on: 2011.02.11 at 03:55:15 PM GMT
//
@@ -13,9 +13,9 @@
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
@@ -32,12 +32,10 @@
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <sequence>
- * <element name="facet" type="{http://www.savara.org/activity}Facet" maxOccurs="unbounded"/>
* <element name="analysis" type="{http://www.savara.org/activity}Analysis" maxOccurs="unbounded" minOccurs="0"/>
+ * <element name="context" type="{http://www.savara.org/activity}Context" maxOccurs="unbounded" minOccurs="0"/>
* </sequence>
* <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- * <attribute name="componentName" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="componentInstanceId" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="timestamp" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
* </restriction>
* </complexContent>
@@ -48,83 +46,82 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Activity", propOrder = {
- "facet",
- "analysis"
+ "analysis",
+ "context"
})
+@XmlSeeAlso({
+ ComponentActivity.class,
+ InteractionActivity.class
+})
public class Activity {
- @XmlElement(required = true)
- protected List<Facet> facet;
protected List<Analysis> analysis;
- @XmlAttribute(name = "id")
+ protected List<Context> context;
+ @XmlAttribute
@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@XmlID
@XmlSchemaType(name = "ID")
protected String id;
- @XmlAttribute(name = "componentName")
- protected String componentName;
- @XmlAttribute(name = "componentInstanceId")
- protected String componentInstanceId;
- @XmlAttribute(name = "timestamp")
+ @XmlAttribute
@XmlSchemaType(name = "dateTime")
protected XMLGregorianCalendar timestamp;
/**
- * Gets the value of the facet property.
+ * Gets the value of the analysis property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the facet property.
+ * This is why there is not a <CODE>set</CODE> method for the analysis property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
- * getFacet().add(newItem);
+ * getAnalysis().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Facet }
+ * {@link Analysis }
*
*
*/
- public List<Facet> getFacet() {
- if (facet == null) {
- facet = new ArrayList<Facet>();
+ public List<Analysis> getAnalysis() {
+ if (analysis == null) {
+ analysis = new ArrayList<Analysis>();
}
- return this.facet;
+ return this.analysis;
}
/**
- * Gets the value of the analysis property.
+ * Gets the value of the context property.
*
* <p>
* This accessor method returns a reference to the live list,
* not a snapshot. Therefore any modification you make to the
* returned list will be present inside the JAXB object.
- * This is why there is not a <CODE>set</CODE> method for the analysis property.
+ * This is why there is not a <CODE>set</CODE> method for the context property.
*
* <p>
* For example, to add a new item, do as follows:
* <pre>
- * getAnalysis().add(newItem);
+ * getContext().add(newItem);
* </pre>
*
*
* <p>
* Objects of the following type(s) are allowed in the list
- * {@link Analysis }
+ * {@link Context }
*
*
*/
- public List<Analysis> getAnalysis() {
- if (analysis == null) {
- analysis = new ArrayList<Analysis>();
+ public List<Context> getContext() {
+ if (context == null) {
+ context = new ArrayList<Context>();
}
- return this.analysis;
+ return this.context;
}
/**
@@ -152,54 +149,6 @@
}
/**
- * Gets the value of the componentName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getComponentName() {
- return componentName;
- }
-
- /**
- * Sets the value of the componentName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setComponentName(String value) {
- this.componentName = value;
- }
-
- /**
- * Gets the value of the componentInstanceId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getComponentInstanceId() {
- return componentInstanceId;
- }
-
- /**
- * Sets the value of the componentInstanceId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setComponentInstanceId(String value) {
- this.componentInstanceId = value;
- }
-
- /**
* Gets the value of the timestamp property.
*
* @return
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Analysis.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
+// Generated on: 2011.02.11 at 03:55:15 PM GMT
//
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ComponentActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ComponentActivity.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ComponentActivity.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -0,0 +1,148 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.02.11 at 03:55:15 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for ComponentActivity complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="ComponentActivity">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}Activity">
+ * <attribute name="instanceId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="componentId" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="componentName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="status" type="{http://www.savara.org/activity}Status" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ComponentActivity")
+public class ComponentActivity
+ extends Activity
+{
+
+ @XmlAttribute
+ protected String instanceId;
+ @XmlAttribute
+ protected String componentId;
+ @XmlAttribute
+ protected String componentName;
+ @XmlAttribute
+ protected Status status;
+
+ /**
+ * Gets the value of the instanceId property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getInstanceId() {
+ return instanceId;
+ }
+
+ /**
+ * Sets the value of the instanceId property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setInstanceId(String value) {
+ this.instanceId = value;
+ }
+
+ /**
+ * Gets the value of the componentId property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getComponentId() {
+ return componentId;
+ }
+
+ /**
+ * Sets the value of the componentId property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setComponentId(String value) {
+ this.componentId = value;
+ }
+
+ /**
+ * Gets the value of the componentName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getComponentName() {
+ return componentName;
+ }
+
+ /**
+ * Sets the value of the componentName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setComponentName(String value) {
+ this.componentName = value;
+ }
+
+ /**
+ * Gets the value of the status property.
+ *
+ * @return
+ * possible object is
+ * {@link Status }
+ *
+ */
+ public Status getStatus() {
+ return status;
+ }
+
+ /**
+ * Sets the value of the status property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Status }
+ *
+ */
+ public void setStatus(Status value) {
+ this.status = value;
+ }
+
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Context.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Context.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Context.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
+// Generated on: 2011.02.11 at 03:55:15 PM GMT
//
@@ -22,10 +22,10 @@
* <pre>
* <complexType name="Context">
* <complexContent>
- * <extension base="{http://www.savara.org/activity}Facet">
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
* <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
+ * </restriction>
* </complexContent>
* </complexType>
* </pre>
@@ -34,13 +34,11 @@
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlType(name = "Context")
-public class Context
- extends Facet
-{
+public class Context {
- @XmlAttribute(name = "name")
+ @XmlAttribute
protected String name;
- @XmlAttribute(name = "value")
+ @XmlAttribute
protected String value;
/**
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Error.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,94 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
-//
-
-
-package org.savara.activity.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for Error complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Error">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}Facet">
- * <attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Error")
-public class Error
- extends Facet
-{
-
- @XmlAttribute(name = "description")
- protected String description;
- @XmlAttribute(name = "type")
- protected String type;
-
- /**
- * Gets the value of the description property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Sets the value of the description property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDescription(String value) {
- this.description = value;
- }
-
- /**
- * Gets the value of the type property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getType() {
- return type;
- }
-
- /**
- * Sets the value of the type property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setType(String value) {
- this.type = value;
- }
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Facet.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Facet.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Facet.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,46 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
-//
-
-
-package org.savara.activity.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for Facet complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Facet">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Facet")
-@XmlSeeAlso({
- Error.class,
- Context.class,
- Process.class,
- Task.class,
- Interaction.class,
- Lifecycle.class
-})
-public abstract class Facet {
-
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceFinished.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,39 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
-//
-
-
-package org.savara.activity.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for InstanceFinished complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="InstanceFinished">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}Lifecycle">
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InstanceFinished")
-public class InstanceFinished
- extends Lifecycle
-{
-
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InstanceStarted.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,39 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
-//
-
-
-package org.savara.activity.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for InstanceStarted complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="InstanceStarted">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}Lifecycle">
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InstanceStarted")
-public class InstanceStarted
- extends Lifecycle
-{
-
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Interaction.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Interaction.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Interaction.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,191 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
-//
-
-
-package org.savara.activity.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for Interaction complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Interaction">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}Facet">
- * <sequence>
- * <element name="value" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
- * </sequence>
- * <attribute name="operationName" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="faultName" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="messageType" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="request" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Interaction", propOrder = {
- "value"
-})
-@XmlSeeAlso({
- MessageReceived.class,
- MessageSent.class
-})
-public abstract class Interaction
- extends Facet
-{
-
- @XmlElement(required = true)
- @XmlSchemaType(name = "anyURI")
- protected String value;
- @XmlAttribute(name = "operationName")
- protected String operationName;
- @XmlAttribute(name = "faultName")
- protected String faultName;
- @XmlAttribute(name = "messageType")
- protected String messageType;
- @XmlAttribute(name = "request")
- protected Boolean request;
-
- /**
- * Gets the value of the value property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getValue() {
- return value;
- }
-
- /**
- * Sets the value of the value property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setValue(String value) {
- this.value = value;
- }
-
- /**
- * Gets the value of the operationName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getOperationName() {
- return operationName;
- }
-
- /**
- * Sets the value of the operationName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setOperationName(String value) {
- this.operationName = value;
- }
-
- /**
- * Gets the value of the faultName property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getFaultName() {
- return faultName;
- }
-
- /**
- * Sets the value of the faultName property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setFaultName(String value) {
- this.faultName = value;
- }
-
- /**
- * Gets the value of the messageType property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getMessageType() {
- return messageType;
- }
-
- /**
- * Sets the value of the messageType property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setMessageType(String value) {
- this.messageType = value;
- }
-
- /**
- * Gets the value of the request property.
- *
- * @return
- * possible object is
- * {@link Boolean }
- *
- */
- public boolean isRequest() {
- if (request == null) {
- return true;
- } else {
- return request;
- }
- }
-
- /**
- * Sets the value of the request property.
- *
- * @param value
- * allowed object is
- * {@link Boolean }
- *
- */
- public void setRequest(Boolean value) {
- this.request = value;
- }
-
-}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InteractionActivity.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InteractionActivity.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/InteractionActivity.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -0,0 +1,269 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.02.11 at 03:55:15 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for InteractionActivity complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="InteractionActivity">
+ * <complexContent>
+ * <extension base="{http://www.savara.org/activity}Activity">
+ * <sequence>
+ * <element name="parameter" type="{http://www.savara.org/activity}MessageParameter"/>
+ * </sequence>
+ * <attribute name="destinationType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="destinationAddress" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="replyToAddress" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="operationName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="faultName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="request" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ * <attribute name="outbound" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ * </extension>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "InteractionActivity", propOrder = {
+ "parameter"
+})
+public class InteractionActivity
+ extends Activity
+{
+
+ @XmlElement(required = true)
+ protected MessageParameter parameter;
+ @XmlAttribute
+ protected String destinationType;
+ @XmlAttribute
+ protected String destinationAddress;
+ @XmlAttribute
+ protected String replyToAddress;
+ @XmlAttribute
+ protected String operationName;
+ @XmlAttribute
+ protected String faultName;
+ @XmlAttribute
+ protected Boolean request;
+ @XmlAttribute
+ protected Boolean outbound;
+
+ /**
+ * Gets the value of the parameter property.
+ *
+ * @return
+ * possible object is
+ * {@link MessageParameter }
+ *
+ */
+ public MessageParameter getParameter() {
+ return parameter;
+ }
+
+ /**
+ * Sets the value of the parameter property.
+ *
+ * @param value
+ * allowed object is
+ * {@link MessageParameter }
+ *
+ */
+ public void setParameter(MessageParameter value) {
+ this.parameter = value;
+ }
+
+ /**
+ * Gets the value of the destinationType property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getDestinationType() {
+ return destinationType;
+ }
+
+ /**
+ * Sets the value of the destinationType property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setDestinationType(String value) {
+ this.destinationType = value;
+ }
+
+ /**
+ * Gets the value of the destinationAddress property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getDestinationAddress() {
+ return destinationAddress;
+ }
+
+ /**
+ * Sets the value of the destinationAddress property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setDestinationAddress(String value) {
+ this.destinationAddress = value;
+ }
+
+ /**
+ * Gets the value of the replyToAddress property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getReplyToAddress() {
+ return replyToAddress;
+ }
+
+ /**
+ * Sets the value of the replyToAddress property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setReplyToAddress(String value) {
+ this.replyToAddress = value;
+ }
+
+ /**
+ * Gets the value of the operationName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getOperationName() {
+ return operationName;
+ }
+
+ /**
+ * Sets the value of the operationName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setOperationName(String value) {
+ this.operationName = value;
+ }
+
+ /**
+ * Gets the value of the faultName property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getFaultName() {
+ return faultName;
+ }
+
+ /**
+ * Sets the value of the faultName property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setFaultName(String value) {
+ this.faultName = value;
+ }
+
+ /**
+ * Gets the value of the request property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isRequest() {
+ if (request == null) {
+ return true;
+ } else {
+ return request;
+ }
+ }
+
+ /**
+ * Sets the value of the request property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setRequest(Boolean value) {
+ this.request = value;
+ }
+
+ /**
+ * Gets the value of the outbound property.
+ *
+ * @return
+ * possible object is
+ * {@link Boolean }
+ *
+ */
+ public boolean isOutbound() {
+ if (outbound == null) {
+ return true;
+ } else {
+ return outbound;
+ }
+ }
+
+ /**
+ * Sets the value of the outbound property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Boolean }
+ *
+ */
+ public void setOutbound(Boolean value) {
+ this.outbound = value;
+ }
+
+}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Lifecycle.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Lifecycle.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Lifecycle.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,44 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
-//
-
-
-package org.savara.activity.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for Lifecycle complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Lifecycle">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}Facet">
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Lifecycle")
-@XmlSeeAlso({
- InstanceStarted.class,
- InstanceFinished.class
-})
-public abstract class Lifecycle
- extends Facet
-{
-
-
-}
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageParameter.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageParameter.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageParameter.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -0,0 +1,99 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.02.11 at 03:55:15 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for MessageParameter complex type.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ *
+ * <pre>
+ * <complexType name="MessageParameter">
+ * <complexContent>
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ * <sequence>
+ * <element name="value" type="{http://www.w3.org/2001/XMLSchema}anyURI"/>
+ * </sequence>
+ * <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * </restriction>
+ * </complexContent>
+ * </complexType>
+ * </pre>
+ *
+ *
+ */
+(a)XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MessageParameter", propOrder = {
+ "value"
+})
+public class MessageParameter {
+
+ @XmlElement(required = true)
+ @XmlSchemaType(name = "anyURI")
+ protected String value;
+ @XmlAttribute
+ protected String type;
+
+ /**
+ * Gets the value of the value property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getValue() {
+ return value;
+ }
+
+ /**
+ * Sets the value of the value property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ /**
+ * Gets the value of the type property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getType() {
+ return type;
+ }
+
+ /**
+ * Sets the value of the type property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setType(String value) {
+ this.type = value;
+ }
+
+}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageReceived.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,67 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
-//
-
-
-package org.savara.activity.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MessageReceived complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="MessageReceived">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}Interaction">
- * <attribute name="source" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MessageReceived")
-public class MessageReceived
- extends Interaction
-{
-
- @XmlAttribute(name = "source")
- protected String source;
-
- /**
- * Gets the value of the source property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getSource() {
- return source;
- }
-
- /**
- * Sets the value of the source property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setSource(String value) {
- this.source = value;
- }
-
-}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/MessageSent.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,67 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
-//
-
-
-package org.savara.activity.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for MessageSent complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="MessageSent">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}Interaction">
- * <attribute name="destination" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MessageSent")
-public class MessageSent
- extends Interaction
-{
-
- @XmlAttribute(name = "destination")
- protected String destination;
-
- /**
- * Gets the value of the destination property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDestination() {
- return destination;
- }
-
- /**
- * Sets the value of the destination property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDestination(String value) {
- this.destination = value;
- }
-
-}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ObjectFactory.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,14 +1,17 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
+// Generated on: 2011.02.11 at 03:55:15 PM GMT
//
package org.savara.activity.model;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlElementDecl;
import javax.xml.bind.annotation.XmlRegistry;
+import javax.xml.namespace.QName;
/**
@@ -28,6 +31,7 @@
@XmlRegistry
public class ObjectFactory {
+ private final static QName _Activity_QNAME = new QName("http://www.savara.org/activity", "activity");
/**
* Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.savara.activity.model
@@ -37,14 +41,6 @@
}
/**
- * Create an instance of {@link Process }
- *
- */
- public Process createProcess() {
- return new Process();
- }
-
- /**
* Create an instance of {@link Activity }
*
*/
@@ -61,59 +57,44 @@
}
/**
- * Create an instance of {@link ProtocolAnalysis }
+ * Create an instance of {@link InteractionActivity }
*
*/
- public ProtocolAnalysis createProtocolAnalysis() {
- return new ProtocolAnalysis();
+ public InteractionActivity createInteractionActivity() {
+ return new InteractionActivity();
}
/**
- * Create an instance of {@link MessageReceived }
+ * Create an instance of {@link MessageParameter }
*
*/
- public MessageReceived createMessageReceived() {
- return new MessageReceived();
+ public MessageParameter createMessageParameter() {
+ return new MessageParameter();
}
/**
- * Create an instance of {@link Error }
+ * Create an instance of {@link ComponentActivity }
*
*/
- public Error createError() {
- return new Error();
+ public ComponentActivity createComponentActivity() {
+ return new ComponentActivity();
}
/**
- * Create an instance of {@link Task }
+ * Create an instance of {@link ProtocolAnalysis }
*
*/
- public Task createTask() {
- return new Task();
+ public ProtocolAnalysis createProtocolAnalysis() {
+ return new ProtocolAnalysis();
}
/**
- * Create an instance of {@link InstanceFinished }
+ * Create an instance of {@link JAXBElement }{@code <}{@link Activity }{@code >}}
*
*/
- public InstanceFinished createInstanceFinished() {
- return new InstanceFinished();
+ @XmlElementDecl(namespace = "http://www.savara.org/activity", name = "activity")
+ public JAXBElement<Activity> createActivity(Activity value) {
+ return new JAXBElement<Activity>(_Activity_QNAME, Activity.class, null, value);
}
- /**
- * Create an instance of {@link MessageSent }
- *
- */
- public MessageSent createMessageSent() {
- return new MessageSent();
- }
-
- /**
- * Create an instance of {@link InstanceStarted }
- *
- */
- public InstanceStarted createInstanceStarted() {
- return new InstanceStarted();
- }
-
}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Process.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Process.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Process.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,121 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
-//
-
-
-package org.savara.activity.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for Process complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Process">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}Facet">
- * <attribute name="instanceId" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="definitionId" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Process")
-public class Process
- extends Facet
-{
-
- @XmlAttribute(name = "instanceId")
- protected String instanceId;
- @XmlAttribute(name = "definitionId")
- protected String definitionId;
- @XmlAttribute(name = "name")
- protected String name;
-
- /**
- * Gets the value of the instanceId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getInstanceId() {
- return instanceId;
- }
-
- /**
- * Sets the value of the instanceId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setInstanceId(String value) {
- this.instanceId = value;
- }
-
- /**
- * Gets the value of the definitionId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDefinitionId() {
- return definitionId;
- }
-
- /**
- * Sets the value of the definitionId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDefinitionId(String value) {
- this.definitionId = value;
- }
-
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
-
-}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/ProtocolAnalysis.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
+// Generated on: 2011.02.11 at 03:55:15 PM GMT
//
@@ -39,11 +39,11 @@
extends Analysis
{
- @XmlAttribute(name = "protocol")
+ @XmlAttribute
protected String protocol;
- @XmlAttribute(name = "role")
+ @XmlAttribute
protected String role;
- @XmlAttribute(name = "expected")
+ @XmlAttribute
protected Boolean expected;
/**
Added: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Status.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Status.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Status.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -0,0 +1,58 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
+// Any modifications to this file will be lost upon recompilation of the source schema.
+// Generated on: 2011.02.11 at 03:55:15 PM GMT
+//
+
+
+package org.savara.activity.model;
+
+import javax.xml.bind.annotation.XmlEnum;
+import javax.xml.bind.annotation.XmlEnumValue;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for Status.
+ *
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * <pre>
+ * <simpleType name="Status">
+ * <restriction base="{http://www.w3.org/2001/XMLSchema}string">
+ * <enumeration value="Started"/>
+ * <enumeration value="Finished"/>
+ * </restriction>
+ * </simpleType>
+ * </pre>
+ *
+ */
+@XmlType(name = "Status")
+@XmlEnum
+public enum Status {
+
+ @XmlEnumValue("Started")
+ STARTED("Started"),
+ @XmlEnumValue("Finished")
+ FINISHED("Finished");
+ private final String value;
+
+ Status(String v) {
+ value = v;
+ }
+
+ public String value() {
+ return value;
+ }
+
+ public static Status fromValue(String v) {
+ for (Status c: Status.values()) {
+ if (c.value.equals(v)) {
+ return c;
+ }
+ }
+ throw new IllegalArgumentException(v);
+ }
+
+}
Deleted: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Task.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Task.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/Task.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,94 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
-// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
-//
-
-
-package org.savara.activity.model;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for Task complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="Task">
- * <complexContent>
- * <extension base="{http://www.savara.org/activity}Facet">
- * <attribute name="definitionId" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-(a)XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "Task")
-public class Task
- extends Facet
-{
-
- @XmlAttribute(name = "definitionId")
- protected String definitionId;
- @XmlAttribute(name = "name")
- protected String name;
-
- /**
- * Gets the value of the definitionId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getDefinitionId() {
- return definitionId;
- }
-
- /**
- * Sets the value of the definitionId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setDefinitionId(String value) {
- this.definitionId = value;
- }
-
- /**
- * Gets the value of the name property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getName() {
- return name;
- }
-
- /**
- * Sets the value of the name property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setName(String value) {
- this.name = value;
- }
-
-}
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/model/package-info.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -1,8 +1,8 @@
//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-833
// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
// Any modifications to this file will be lost upon recompilation of the source schema.
-// Generated on: 2011.01.26 at 04:49:35 PM GMT
+// Generated on: 2011.02.11 at 03:55:15 PM GMT
//
@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/activity", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
Modified: branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/osgi/Activator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/osgi/Activator.java 2011-02-11 15:40:48 UTC (rev 659)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/main/java/org/savara/activity/osgi/Activator.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -24,10 +24,10 @@
import org.osgi.framework.BundleContext;
import org.osgi.framework.ServiceReference;
import org.osgi.util.tracker.ServiceTracker;
-import org.savara.activity.validation.ActivityAnalyser;
-import org.savara.activity.validation.ActivityValidationManager;
-import org.savara.activity.validation.ActivityValidationManagerFactory;
-import org.savara.activity.validation.ActivityValidator;
+import org.savara.activity.ActivityAnalyser;
+import org.savara.activity.ActivityProcessor;
+import org.savara.activity.ActivityProcessorFactory;
+import org.savara.activity.ActivityValidator;
public class Activator implements BundleActivator {
@@ -52,9 +52,9 @@
Properties props = new Properties();
// Register activity validation manager
- final ActivityValidationManager avm=ActivityValidationManagerFactory.getActivityValidationManager();
+ final ActivityProcessor avm=ActivityProcessorFactory.getActivityProcessor();
- context.registerService(ActivityValidationManager.class.getName(),
+ context.registerService(ActivityProcessor.class.getName(),
avm, props);
_log.fine("Registered Activity Validation Manager");
Copied: branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/DefaultActivityProcessorTest.java (from rev 648, branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/validation/DefaultActivityValidationManagerTest.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/DefaultActivityProcessorTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.activity/src/test/java/org/savara/activity/DefaultActivityProcessorTest.java 2011-02-11 16:47:02 UTC (rev 660)
@@ -0,0 +1,127 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008-11, 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.savara.activity;
+
+import org.junit.Test;
+import org.savara.activity.ActivityAnalyser;
+import org.savara.activity.ActivityProcessor;
+import org.savara.activity.ActivityValidator;
+import org.savara.activity.DefaultActivityProcessor;
+import org.savara.activity.model.Activity;
+
+import static org.junit.Assert.*;
+
+public class DefaultActivityProcessorTest {
+
+ @Test
+ public void testAddRemoveAnalyser() {
+ DefaultActivityProcessor avm=new DefaultActivityProcessor();
+
+ TestAnalyser ta=new TestAnalyser();
+ avm.addActivityAnalyser(ta);
+
+ if (avm.getAnalysers().contains(ta) == false) {
+ fail("Analyser not found");
+ }
+
+ avm.removeActivityAnalyser(ta);
+
+ if (avm.getAnalysers().contains(ta) == true) {
+ fail("Analyser not removed");
+ }
+ }
+
+ @Test
+ public void testAddRemoveValidator() {
+ DefaultActivityProcessor avm=new DefaultActivityProcessor();
+
+ TestValidator tv=new TestValidator();
+ avm.addActivityValidator(tv);
+
+ if (avm.getValidators().contains(tv) == false) {
+ fail("Validator not found");
+ }
+
+ avm.removeActivityValidator(tv);
+
+ if (avm.getValidators().contains(tv) == true) {
+ fail("Validator not removed");
+ }
+ }
+
+ @Test
+ public void testAnalysisBeforeValidate() {
+ ActivityProcessor avm=new DefaultActivityProcessor();
+
+ TestOrderAnalyserValidator tav=new TestOrderAnalyserValidator();
+
+ avm.addActivityAnalyser(tav);
+ avm.addActivityValidator(tav);
+
+ Activity act=new Activity();
+
+ avm.process(act);
+ }
+
+ public class TestAnalyser implements ActivityAnalyser {
+
+ private Activity m_activity=null;
+
+ public Activity getActivity() {
+ return(m_activity);
+ }
+
+ public void analyse(Activity activity) {
+ m_activity = activity;
+ }
+
+ }
+
+ public class TestValidator implements ActivityValidator {
+
+ private Activity m_activity=null;
+
+ public Activity getActivity() {
+ return(m_activity);
+ }
+
+ public void validate(Activity activity) {
+ m_activity = activity;
+ }
+ }
+
+ public class TestOrderAnalyserValidator implements ActivityAnalyser, ActivityValidator {
+
+ private Activity m_activity=null;
+
+ public void validate(Activity activity) {
+ if (m_activity != activity) {
+ // Should be activity that was analysed
+ fail("Activity did not match");
+ }
+ }
+
+ public void analyse(Activity activity) {
+ if (m_activity != null) {
+ fail("Activity should not be set");
+ }
+ m_activity = activity;
+ }
+
+ }
+}
15 years, 2 months
- 1
- 0